mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-17 00:44:19 +00:00
Code Activity

Fix for win32 drag-and-drop.

Browse source
This commit is contained in:
Julian Storer 2010-02-16 12:03:14 +00:00
parent 3057acf0b3
commit f97cf1aaa5
6 changed files with 1225 additions and 1227 deletions
Download patch file Download diff file Expand all files Collapse all files

2426
extras/browser plugins/wrapper/juce_NPAPI_GlueCode.cpp
View file

File diff suppressed because it is too large Load diff

11
juce_amalgamated.cpp
View file

@ -67137,7 +67137,7 @@ void OldSchoolLookAndFeel::drawButtonBackground (Graphics& g,
void OldSchoolLookAndFeel::drawTickBox (Graphics& g,
Component& /*component*/,
int x, int y, int w, int h,
float x, float y, float w, float h,
const bool ticked,
const bool isEnabled,
const bool /*isMouseOverButton*/,
@ -67149,8 +67149,7 @@ void OldSchoolLookAndFeel::drawTickBox (Graphics& g,
g.setColour (isEnabled ? Colours::blue.withAlpha (isButtonDown ? 0.3f : 0.1f)
: Colours::lightgrey.withAlpha (0.1f));
AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f)
.translated ((float) x, (float) y));
AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f).translated (x, y));
g.fillPath (box, trans);
@ -67182,8 +67181,8 @@ void OldSchoolLookAndFeel::drawToggleButton (Graphics& g,
const int tickWidth = jmin (20, button.getHeight() - 4);
drawTickBox (g, button, 4, (button.getHeight() - tickWidth) / 2,
tickWidth, tickWidth,
drawTickBox (g, button, 4.0f, (button.getHeight() - tickWidth) * 0.5f,
(float) tickWidth, (float) tickWidth,
button.getToggleState(),
button.isEnabled(),
isMouseOverButton,
@ -217258,7 +217257,7 @@ public:
HRESULT __stdcall GetData (FORMATETC __RPC_FAR* pFormatEtc, STGMEDIUM __RPC_FAR* pMedium)
{
if (pFormatEtc->tymed == format->tymed
if ((pFormatEtc->tymed & format->tymed) != 0
&& pFormatEtc->cfFormat == format->cfFormat
&& pFormatEtc->dwAspect == format->dwAspect)
{

2
juce_amalgamated.h
View file

@ -25320,7 +25320,7 @@ public:
virtual void drawTickBox (Graphics& g,
Component& component,
int x, int y, int w, int h,
float x, float y, float w, float h,
const bool ticked,
const bool isEnabled,
const bool isMouseOverButton,

9
src/gui/components/lookandfeel/juce_OldSchoolLookAndFeel.cpp
View file

@ -110,7 +110,7 @@ void OldSchoolLookAndFeel::drawButtonBackground (Graphics& g,
void OldSchoolLookAndFeel::drawTickBox (Graphics& g,
Component& /*component*/,
int x, int y, int w, int h,
float x, float y, float w, float h,
const bool ticked,
const bool isEnabled,
const bool /*isMouseOverButton*/,
@ -122,8 +122,7 @@ void OldSchoolLookAndFeel::drawTickBox (Graphics& g,
g.setColour (isEnabled ? Colours::blue.withAlpha (isButtonDown ? 0.3f : 0.1f)
: Colours::lightgrey.withAlpha (0.1f));
AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f)
.translated ((float) x, (float) y));
AffineTransform trans (AffineTransform::scale (w / 9.0f, h / 9.0f).translated (x, y));
g.fillPath (box, trans);
@ -155,8 +154,8 @@ void OldSchoolLookAndFeel::drawToggleButton (Graphics& g,
const int tickWidth = jmin (20, button.getHeight() - 4);
drawTickBox (g, button, 4, (button.getHeight() - tickWidth) / 2,
tickWidth, tickWidth,
drawTickBox (g, button, 4.0f, (button.getHeight() - tickWidth) * 0.5f,
(float) tickWidth, (float) tickWidth,
button.getToggleState(),
button.isEnabled(),
isMouseOverButton,

2
src/gui/components/lookandfeel/juce_OldSchoolLookAndFeel.h
View file

@ -61,7 +61,7 @@ public:
virtual void drawTickBox (Graphics& g,
Component& component,
int x, int y, int w, int h,
float x, float y, float w, float h,
const bool ticked,
const bool isEnabled,
const bool isMouseOverButton,

2
src/native/windows/juce_win32_Windowing.cpp
View file

@ -2960,7 +2960,7 @@ public:
HRESULT __stdcall GetData (FORMATETC __RPC_FAR* pFormatEtc, STGMEDIUM __RPC_FAR* pMedium)
{
if (pFormatEtc->tymed == format->tymed
if ((pFormatEtc->tymed & format->tymed) != 0
&& pFormatEtc->cfFormat == format->cfFormat
&& pFormatEtc->dwAspect == format->dwAspect)
{