mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Change PickerDirector to an enum class

Browse source
This commit is contained in:
Thomas Goyne 2013-01-13 10:49:35 -08:00
parent 2072241e54
commit fa8fb65b8a
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
aegisub/src/dialog_colorpicker.cpp
View file

@ -74,14 +74,13 @@
namespace { namespace {
enum class PickerDirection {
HorzVert,
Horz,
Vert
};
class ColorPickerSpectrum : public wxControl { class ColorPickerSpectrum : public wxControl {
public:
enum PickerDirection {
HorzVert,
Horz,
Vert
};
private:
int x; int x;
int y; int y;
@ -259,8 +258,8 @@ ColorPickerSpectrum::ColorPickerSpectrum(wxWindow *parent, PickerDirection direc
size.x += 2; size.x += 2;
size.y += 2; size.y += 2;
if (direction == Vert) size.x += spectrum_horz_vert_arrow_size + 1; if (direction == PickerDirection::Vert) size.x += spectrum_horz_vert_arrow_size + 1;
if (direction == Horz) size.y += spectrum_horz_vert_arrow_size + 1; if (direction == PickerDirection::Horz) size.y += spectrum_horz_vert_arrow_size + 1;
SetClientSize(size); SetClientSize(size);
SetMinSize(GetSize()); SetMinSize(GetSize());
@ -310,12 +309,12 @@ void ColorPickerSpectrum::OnPaint(wxPaintEvent &) {
dc.SetPen(invpen); dc.SetPen(invpen);
switch (direction) { switch (direction) {
case HorzVert: case PickerDirection::HorzVert:
// Make a little cross // Make a little cross
dc.DrawLine(x-4, y+1, x+7, y+1); dc.DrawLine(x-4, y+1, x+7, y+1);
dc.DrawLine(x+1, y-4, x+1, y+7); dc.DrawLine(x+1, y-4, x+1, y+7);
break; break;
case Horz: case PickerDirection::Horz:
// Make a vertical line stretching all the way across // Make a vertical line stretching all the way across
dc.DrawLine(x+1, 1, x+1, height+1); dc.DrawLine(x+1, 1, x+1, height+1);
// Points for arrow // Points for arrow
@ -328,7 +327,7 @@ void ColorPickerSpectrum::OnPaint(wxPaintEvent &) {
arrow_box.SetRight(width + 1 + spectrum_horz_vert_arrow_size); arrow_box.SetRight(width + 1 + spectrum_horz_vert_arrow_size);
arrow_box.SetBottom(height + 2 + spectrum_horz_vert_arrow_size); arrow_box.SetBottom(height + 2 + spectrum_horz_vert_arrow_size);
break; break;
case Vert: case PickerDirection::Vert:
// Make a horizontal line stretching all the way across // Make a horizontal line stretching all the way across
dc.DrawLine(1, y+1, width+1, y+1); dc.DrawLine(1, y+1, width+1, y+1);
// Points for arrow // Points for arrow
@ -343,7 +342,7 @@ void ColorPickerSpectrum::OnPaint(wxPaintEvent &) {
break; break;
} }
if (direction == Horz || direction == Vert) { if (direction == PickerDirection::Horz || direction == PickerDirection::Vert) {
wxBrush bgBrush; wxBrush bgBrush;
bgBrush.SetColour(GetBackgroundColour()); bgBrush.SetColour(GetBackgroundColour());
dc.SetLogicalFunction(wxCOPY); dc.SetLogicalFunction(wxCOPY);
@ -606,9 +605,9 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,
// Create the controls for the dialog // Create the controls for the dialog
wxSizer *spectrum_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Color spectrum")); wxSizer *spectrum_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Color spectrum"));
spectrum = new ColorPickerSpectrum(this, ColorPickerSpectrum::HorzVert, wxSize(256, 256)); spectrum = new ColorPickerSpectrum(this, PickerDirection::HorzVert, wxSize(256, 256));
slider = new ColorPickerSpectrum(this, ColorPickerSpectrum::Vert, wxSize(slider_width, 256)); slider = new ColorPickerSpectrum(this, PickerDirection::Vert, wxSize(slider_width, 256));
alpha_slider = new ColorPickerSpectrum(this, ColorPickerSpectrum::Vert, wxSize(slider_width, 256)); alpha_slider = new ColorPickerSpectrum(this, PickerDirection::Vert, wxSize(slider_width, 256));
wxString modes[] = { _("RGB/R"), _("RGB/G"), _("RGB/B"), _("HSL/L"), _("HSV/H") }; wxString modes[] = { _("RGB/R"), _("RGB/G"), _("RGB/B"), _("HSL/L"), _("HSV/H") };
colorspace_choice = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, 5, modes); colorspace_choice = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, 5, modes);