From fa7c2de28d9f4c50aabdc9f91b3881d3db255f04 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 29 Oct 2015 09:28:56 +0100 Subject: [PATCH] Add slider labels in wxGenericColourDialog. --- src/generic/colrdlgg.cpp | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index ab5cb71e98..cc5e7dd941 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -328,15 +328,30 @@ void wxGenericColourDialog::CreateWidgets() sliderSizer->Add(sliderX, sliderHeight ); + const wxSizerFlags sliderLabelFlags = wxSizerFlags().Right().Border(); + const wxSizerFlags onesliderFlags = wxSizerFlags().CenterHorizontal(); const wxSizerFlags sliderFlags = wxSizerFlags().CentreVertical().DoubleBorder(); - sliderSizer->Add(m_redSlider, sliderFlags); - sliderSizer->Add(m_greenSlider, sliderFlags); - sliderSizer->Add(m_blueSlider, sliderFlags); + wxBoxSizer *redSliderSizer = new wxBoxSizer(wxVERTICAL); + redSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Red:")), sliderLabelFlags); + redSliderSizer->Add(m_redSlider, onesliderFlags); + wxBoxSizer *greenSliderSizer = new wxBoxSizer(wxVERTICAL); + greenSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Green:")), sliderLabelFlags); + greenSliderSizer->Add(m_greenSlider, onesliderFlags); + wxBoxSizer *blueSliderSizer = new wxBoxSizer(wxVERTICAL); + blueSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Blue:")), sliderLabelFlags); + blueSliderSizer->Add(m_blueSlider, onesliderFlags); + + sliderSizer->Add(redSliderSizer, sliderFlags); + sliderSizer->Add(greenSliderSizer, sliderFlags); + sliderSizer->Add(blueSliderSizer, sliderFlags); if ( m_colourData.GetChooseAlpha() ) - { - sliderSizer->Add(m_alphaSlider, sliderFlags); + { + wxBoxSizer *alphaSliderSizer = new wxBoxSizer(wxVERTICAL); + alphaSliderSizer->Add(new wxStaticText(this, wxID_ANY, _("Opacity:")), sliderLabelFlags); + alphaSliderSizer->Add(m_alphaSlider, onesliderFlags); + sliderSizer->Add(alphaSliderSizer, sliderFlags); } topSizer->Add(sliderSizer, wxSizerFlags().Centre().DoubleBorder());