iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Tweaks to mouse cursors in colour picker dialog. 

Originally committed to SVN as r1358.
This commit is contained in:
Niels Martin Hansen 2007-07-04 22:23:52 +00:00
parent 55a06f00b9
commit 522f5030b0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aegisub/dialog_colorpicker.cpp
View File

@ -131,8 +131,10 @@ void ColorPickerSpectrum::OnMouse(wxMouseEvent &evt)
if (evt.LeftDown()) { if (evt.LeftDown()) {
CaptureMouse(); CaptureMouse();
SetCursor(wxCursor(wxCURSOR_BLANK));
} else if (evt.LeftUp() && HasCapture()) { } else if (evt.LeftUp() && HasCapture()) {
ReleaseMouse(); ReleaseMouse();
SetCursor(wxNullCursor);
} }
if (evt.LeftDown() || (HasCapture() && evt.LeftIsDown())) { if (evt.LeftDown() || (HasCapture() && evt.LeftIsDown())) {
@ -157,6 +159,7 @@ ColorPickerRecent::ColorPickerRecent(wxWindow *parent, wxWindowID id, int _cols,
SetClientSize(cols*cellsize, rows*cellsize); SetClientSize(cols*cellsize, rows*cellsize);
SetMinSize(GetSize()); SetMinSize(GetSize());
SetMaxSize(GetSize()); SetMaxSize(GetSize());
SetCursor(*wxCROSS_CURSOR);
} }
void ColorPickerRecent::LoadFromString(const wxString &recent_string) void ColorPickerRecent::LoadFromString(const wxString &recent_string)
@ -260,6 +263,7 @@ ColorPickerScreenDropper::ColorPickerScreenDropper(wxWindow *parent, wxWindowID
SetClientSize(resx*magnification, resy*magnification); SetClientSize(resx*magnification, resy*magnification);
SetMinSize(GetSize()); SetMinSize(GetSize());
SetMaxSize(GetSize()); SetMaxSize(GetSize());
SetCursor(*wxCROSS_CURSOR);
capture = wxBitmap(resx, resy); capture = wxBitmap(resx, resy);
wxMemoryDC capdc; wxMemoryDC capdc;
@ -290,7 +294,7 @@ void ColorPickerScreenDropper::OnMouse(wxMouseEvent &evt)
} else if (evt.LeftDown()) { } else if (evt.LeftDown()) {
if (x == 0 && y == 0 && integrated_dropper) { if (x == 0 && y == 0 && integrated_dropper) {
SetCursor(*wxCROSS_CURSOR); //SetCursor(*wxCROSS_CURSOR);
CaptureMouse(); CaptureMouse();
} else if (x >= 0 && y >= 0 && x < resx && y < resy) { } else if (x >= 0 && y >= 0 && x < resx && y < resy) {
@ -306,7 +310,7 @@ void ColorPickerScreenDropper::OnMouse(wxMouseEvent &evt)
} else if (HasCapture() && evt.LeftUp()) { } else if (HasCapture() && evt.LeftUp()) {
ReleaseMouse(); ReleaseMouse();
SetCursor(wxNullCursor); //SetCursor(wxNullCursor);
} }
} }