mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Redirect mouse events from the color picker dialog to the dropper icon

Browse source 
to make the color dropper work on Unix/GTK. OS X still needs fixes.

Originally committed to SVN as r3975.
This commit is contained in:
Grigori Goronzy 2010-01-12 03:19:49 +00:00
parent e341e05fa2
commit 6006fb5bba
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
aegisub/src/dialog_colorpicker.cpp
View file

@ -660,12 +660,10 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
recent_box = new ColorPickerRecent(this, SELECTOR_RECENT, 8, 4, 16); recent_box = new ColorPickerRecent(this, SELECTOR_RECENT, 8, 4, 16);
#ifdef __WXMSW__
eyedropper_bitmap = GETIMAGE(eyedropper_tool_24); eyedropper_bitmap = GETIMAGE(eyedropper_tool_24);
eyedropper_bitmap.SetMask(new wxMask(eyedropper_bitmap, wxColour(255, 0, 255))); eyedropper_bitmap.SetMask(new wxMask(eyedropper_bitmap, wxColour(255, 0, 255)));
screen_dropper_icon = new wxStaticBitmap(this, SELECTOR_DROPPER, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER); screen_dropper_icon = new wxStaticBitmap(this, SELECTOR_DROPPER, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
screen_dropper = new ColorPickerScreenDropper(this, SELECTOR_DROPPER_PICK, 7, 7, 8, false); screen_dropper = new ColorPickerScreenDropper(this, SELECTOR_DROPPER_PICK, 7, 7, 8, false);
#endif
// Arrange the controls in a nice way // Arrange the controls in a nice way
wxSizer *spectop_sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *spectop_sizer = new wxBoxSizer(wxHORIZONTAL);
@ -728,11 +726,9 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
if (Options.AsBool(_T("RGBAdjust Tool"))) recent_sizer->Add(new wxButton(this,BUTTON_RGBADJUST,_T("rgbadjust()")), 0, wxEXPAND); if (Options.AsBool(_T("RGBAdjust Tool"))) recent_sizer->Add(new wxButton(this,BUTTON_RGBADJUST,_T("rgbadjust()")), 0, wxEXPAND);
wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL);
#ifdef __WXMSW__
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5); picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5);
picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER); picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER);
#endif
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
picker_sizer->Add(recent_sizer, 0, wxALIGN_CENTER); picker_sizer->Add(recent_sizer, 0, wxALIGN_CENTER);
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
@ -774,13 +770,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
SetColor(initial_color); SetColor(initial_color);
recent_box->LoadFromString(Options.AsText(_T("Color Picker Recent"))); recent_box->LoadFromString(Options.AsText(_T("Color Picker Recent")));
#ifdef __WXMSW__
// The mouse event handler for the Dropper control must be manually assigned // The mouse event handler for the Dropper control must be manually assigned
// The EVT_MOUSE_EVENTS macro can't take a control id // The EVT_MOUSE_EVENTS macro can't take a control id
screen_dropper_icon->Connect(wxEVT_MOTION, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this); screen_dropper_icon->Connect(wxEVT_MOTION, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this);
screen_dropper_icon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this); screen_dropper_icon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this);
screen_dropper_icon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this); screen_dropper_icon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this);
#endif
} }
@ -802,9 +796,7 @@ DialogColorPicker::~DialogColorPicker()
delete hsl_slider; delete hsl_slider;
delete hsv_slider; delete hsv_slider;
#ifdef __WXMSW__
if (screen_dropper_icon->HasCapture()) screen_dropper_icon->ReleaseMouse(); if (screen_dropper_icon->HasCapture()) screen_dropper_icon->ReleaseMouse();
#endif
} }
@ -1226,6 +1218,7 @@ BEGIN_EVENT_TABLE(DialogColorPicker, wxDialog)
EVT_COMMAND(SELECTOR_RECENT, wxRECENT_SELECT, DialogColorPicker::OnRecentSelect) EVT_COMMAND(SELECTOR_RECENT, wxRECENT_SELECT, DialogColorPicker::OnRecentSelect)
EVT_COMMAND(SELECTOR_DROPPER_PICK, wxDROPPER_SELECT, DialogColorPicker::OnRecentSelect) EVT_COMMAND(SELECTOR_DROPPER_PICK, wxDROPPER_SELECT, DialogColorPicker::OnRecentSelect)
EVT_BUTTON(BUTTON_RGBADJUST, DialogColorPicker::OnRGBAdjust) EVT_BUTTON(BUTTON_RGBADJUST, DialogColorPicker::OnRGBAdjust)
EVT_MOUSE_EVENTS(DialogColorPicker::OnMouse)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -1442,15 +1435,15 @@ void DialogColorPicker::OnRecentSelect(wxCommandEvent &evt)
void DialogColorPicker::OnDropperMouse(wxMouseEvent &evt) void DialogColorPicker::OnDropperMouse(wxMouseEvent &evt)
{ {
if (evt.LeftDown() && !screen_dropper_icon->HasCapture()) { if (evt.LeftDown() && !screen_dropper_icon->HasCapture()) {
screen_dropper_icon->CaptureMouse();
eyedropper_grab_point = evt.GetPosition();
eyedropper_is_grabbed = false;
#ifdef WIN32 #ifdef WIN32
screen_dropper_icon->SetCursor(wxCursor(_T("eyedropper_cursor"))); screen_dropper_icon->SetCursor(wxCursor(_T("eyedropper_cursor")));
#else #else
screen_dropper_icon->SetCursor(*wxCROSS_CURSOR); screen_dropper_icon->SetCursor(*wxCROSS_CURSOR);
#endif #endif
screen_dropper_icon->SetBitmap(wxNullBitmap); screen_dropper_icon->SetBitmap(wxNullBitmap);
screen_dropper_icon->CaptureMouse();
eyedropper_grab_point = evt.GetPosition();
eyedropper_is_grabbed = false;
} }
if (evt.LeftUp()) { if (evt.LeftUp()) {
@ -1477,6 +1470,23 @@ void DialogColorPicker::OnDropperMouse(wxMouseEvent &evt)
/// @brief Hack to redirect events to the screen dropper icon
/// @param evt
///
void DialogColorPicker::OnMouse(wxMouseEvent &evt)
{
if (screen_dropper_icon->HasCapture()) {
wxPoint dropper_pos = screen_dropper_icon->ScreenToClient(ClientToScreen(evt.GetPosition()));
evt.m_x = dropper_pos.x;
evt.m_y = dropper_pos.y;
screen_dropper_icon->GetEventHandler()->ProcessEvent(evt);
}
else
evt.Skip();
}
/// @brief rgbadjust() tool /// @brief rgbadjust() tool
/// @param evt /// @param evt
/// ///

1
aegisub/src/dialog_colorpicker.h
View file

@ -314,6 +314,7 @@ private:
void OnRecentSelect(wxCommandEvent &evt); // also handles dropper pick void OnRecentSelect(wxCommandEvent &evt); // also handles dropper pick
void OnRGBAdjust(wxCommandEvent &evt); void OnRGBAdjust(wxCommandEvent &evt);
void OnDropperMouse(wxMouseEvent &evt); void OnDropperMouse(wxMouseEvent &evt);
void OnMouse(wxMouseEvent &evt);
/// DOCME /// DOCME