diff --git a/rtdata/images/Dark/actions/expanderClosed.png b/rtdata/images/Dark/actions/expanderClosed.png index 1de089570..559f201db 100644 Binary files a/rtdata/images/Dark/actions/expanderClosed.png and b/rtdata/images/Dark/actions/expanderClosed.png differ diff --git a/rtdata/images/Dark/actions/expanderDisabled.png b/rtdata/images/Dark/actions/expanderDisabled.png index 1593dc5b5..7e35c7266 100644 Binary files a/rtdata/images/Dark/actions/expanderDisabled.png and b/rtdata/images/Dark/actions/expanderDisabled.png differ diff --git a/rtdata/images/Dark/actions/expanderEnabled.png b/rtdata/images/Dark/actions/expanderEnabled.png index a3d16f51c..33e8515af 100644 Binary files a/rtdata/images/Dark/actions/expanderEnabled.png and b/rtdata/images/Dark/actions/expanderEnabled.png differ diff --git a/rtdata/images/Dark/actions/expanderInconsistent.png b/rtdata/images/Dark/actions/expanderInconsistent.png index 06619ca10..e19f8e106 100644 Binary files a/rtdata/images/Dark/actions/expanderInconsistent.png and b/rtdata/images/Dark/actions/expanderInconsistent.png differ diff --git a/rtdata/images/Dark/actions/expanderOpened.png b/rtdata/images/Dark/actions/expanderOpened.png index 176e99dae..9a7f161ee 100644 Binary files a/rtdata/images/Dark/actions/expanderOpened.png and b/rtdata/images/Dark/actions/expanderOpened.png differ diff --git a/rtdata/images/Light/actions/expanderClosed.png b/rtdata/images/Light/actions/expanderClosed.png index 90d1269aa..81a7d85ab 100644 Binary files a/rtdata/images/Light/actions/expanderClosed.png and b/rtdata/images/Light/actions/expanderClosed.png differ diff --git a/rtdata/images/Light/actions/expanderDisabled.png b/rtdata/images/Light/actions/expanderDisabled.png index 27b1ed1d7..8fcef1b01 100644 Binary files a/rtdata/images/Light/actions/expanderDisabled.png and b/rtdata/images/Light/actions/expanderDisabled.png differ diff --git a/rtdata/images/Light/actions/expanderEnabled.png b/rtdata/images/Light/actions/expanderEnabled.png index 402d4aae2..7e2006eb3 100644 Binary files a/rtdata/images/Light/actions/expanderEnabled.png and b/rtdata/images/Light/actions/expanderEnabled.png differ diff --git a/rtdata/images/Light/actions/expanderInconsistent.png b/rtdata/images/Light/actions/expanderInconsistent.png index 9f87059dc..3c2339b60 100644 Binary files a/rtdata/images/Light/actions/expanderInconsistent.png and b/rtdata/images/Light/actions/expanderInconsistent.png differ diff --git a/rtdata/images/Light/actions/expanderOpened.png b/rtdata/images/Light/actions/expanderOpened.png index e53435263..5b003e3f7 100644 Binary files a/rtdata/images/Light/actions/expanderOpened.png and b/rtdata/images/Light/actions/expanderOpened.png differ diff --git a/rtdata/themes/RawTherapee.css b/rtdata/themes/RawTherapee.css index 82548e691..e6eac9793 100644 --- a/rtdata/themes/RawTherapee.css +++ b/rtdata/themes/RawTherapee.css @@ -290,6 +290,10 @@ GtkMenu { #MyExpanderTitle:hover { background-color: #202020; } +#MyExpanderTitle GtkEventBox:hover GtkImage { + background-color: #202020; + border-radius: 3px; +} #MyExpanderTitle:hover GtkLabel { color: #D8D8D8; } diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index da47323aa..7459903ab 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -619,6 +619,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) : if (useEnabled) { statusImage = Gtk::manage(new Gtk::Image(disabledPBuf)); imageEvBox = Gtk::manage(new Gtk::EventBox()); + imageEvBox->set_name("MyExpanderStatus"); imageEvBox->add(*statusImage); imageEvBox->set_above_child(true); imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) ); @@ -645,6 +646,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) : titleEvBox = Gtk::manage(new Gtk::EventBox()); titleEvBox->set_name("MyExpanderTitle"); + titleEvBox->set_border_width(2); titleEvBox->add(*headerHBox); titleEvBox->set_above_child(false); // this is the key! By make it below the child, they will get the events first. titleEvBox->set_can_focus(false); diff --git a/tools/source_icons/scalable/expanderClosed.file b/tools/source_icons/scalable/expanderClosed.file index 039041106..46bb9877d 100644 --- a/tools/source_icons/scalable/expanderClosed.file +++ b/tools/source_icons/scalable/expanderClosed.file @@ -1 +1 @@ -expanderClosed.png,w18,actions +expanderClosed.png,w14,actions diff --git a/tools/source_icons/scalable/expanderClosed.svg b/tools/source_icons/scalable/expanderClosed.svg index ca47969f8..b9778cca4 100644 --- a/tools/source_icons/scalable/expanderClosed.svg +++ b/tools/source_icons/scalable/expanderClosed.svg @@ -10,11 +10,11 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1300" + width="1000" height="1000" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.91 r13725" sodipodi:docname="expanderClosed.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png" inkscape:export-xdpi="2.1600001" @@ -637,13 +637,13 @@ id="stop4223-6" /> + height="1.3672854" + style="color-interpolation-filters:sRGB"> image/svg+xml - + @@ -717,12 +717,12 @@ transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> + transform="matrix(0,-1.0901186,1.0901183,0,-116.40447,102.17828)"> image/svg+xml - + @@ -619,12 +619,12 @@ id="g4060" transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> diff --git a/tools/source_icons/scalable/expanderEnabled.file b/tools/source_icons/scalable/expanderEnabled.file index 790e109da..0835d223a 100644 --- a/tools/source_icons/scalable/expanderEnabled.file +++ b/tools/source_icons/scalable/expanderEnabled.file @@ -1 +1 @@ -expanderEnabled.png,w18,actions +expanderEnabled.png,w14,actions diff --git a/tools/source_icons/scalable/expanderEnabled.svg b/tools/source_icons/scalable/expanderEnabled.svg index 1407ca335..4606416c0 100644 --- a/tools/source_icons/scalable/expanderEnabled.svg +++ b/tools/source_icons/scalable/expanderEnabled.svg @@ -10,11 +10,11 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1300" + width="1000" height="1000" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.91 r13725" sodipodi:docname="expanderEnabled.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png" inkscape:export-xdpi="2.1600001" @@ -555,7 +555,7 @@ + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> image/svg+xml - + @@ -1222,7 +1222,7 @@ id="g4060" transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> diff --git a/tools/source_icons/scalable/expanderOpened.file b/tools/source_icons/scalable/expanderOpened.file index c2175efad..f6bfd1a54 100644 --- a/tools/source_icons/scalable/expanderOpened.file +++ b/tools/source_icons/scalable/expanderOpened.file @@ -1 +1 @@ -expanderOpened.png,w18,actions +expanderOpened.png,w14,actions diff --git a/tools/source_icons/scalable/expanderOpened.svg b/tools/source_icons/scalable/expanderOpened.svg index c00fe2d85..a0092792c 100644 --- a/tools/source_icons/scalable/expanderOpened.svg +++ b/tools/source_icons/scalable/expanderOpened.svg @@ -10,11 +10,11 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1300" + width="1000" height="1000" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.91 r13725" sodipodi:docname="expanderOpened.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png" inkscape:export-xdpi="2.1600001" @@ -637,13 +637,13 @@ id="stop4223-6" /> + height="1.3672854" + style="color-interpolation-filters:sRGB"> image/svg+xml - + @@ -727,12 +727,12 @@ transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> + transform="matrix(1.0901186,0,0,1.0901184,-42.507088,11.516234)">