liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The reset icon can be correctly displayed to its expected size. A new icon (a down arrow) has been added for the Curve editor button. Patch optimised by Hombre (issue 1027, comments 16 and 17)

Browse Source
This commit is contained in:
Philippe Hupe
2011-10-26 19:49:27 +02:00
parent 9611ea90cb
commit 885308c2c8
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/images/popuparrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 235 B

9
rtgui/adjuster.cc
View File

@@ -25,6 +25,8 @@
#include <guiutils.h> #include <guiutils.h>
#include <rtimage.h> #include <rtimage.h>
#define MIN_RESET_BUTTON_HEIGHT 17
extern Glib::ustring argv0; extern Glib::ustring argv0;
Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, bool editedcb) { Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, bool editedcb) {
@@ -72,8 +74,8 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
hbox->pack_end (*spin, Gtk::PACK_SHRINK, 0); hbox->pack_end (*spin, Gtk::PACK_SHRINK, 0);
reset->set_size_request (-1, spin->get_height()); reset->set_size_request (-1, spin->get_height() > MIN_RESET_BUTTON_HEIGHT ? spin->get_height(): MIN_RESET_BUTTON_HEIGHT);
slider = Gtk::manage (new MyHScale ()); slider = Gtk::manage (new MyHScale ());
slider->set_draw_value (false); slider->set_draw_value (false);
@@ -137,7 +139,8 @@ Adjuster::Adjuster (Gtk::Image *imgIcon, double vmin, double vmax, double vstep,
spin->set_has_frame(false); spin->set_has_frame(false);
spin->set_name("FramelessSpinButton"); spin->set_name("FramelessSpinButton");
reset->set_size_request (-1, spin->get_height()); reset->set_size_request (-1, spin->get_height() > MIN_RESET_BUTTON_HEIGHT ? spin->get_height(): MIN_RESET_BUTTON_HEIGHT);
slider = Gtk::manage (new MyHScale ()); slider = Gtk::manage (new MyHScale ());
slider->set_draw_value (false); slider->set_draw_value (false);

4
rtgui/popupcommon.cc
View File

@@ -93,8 +93,8 @@ bool PopUpCommon::addEntry (Glib::ustring fileName, Glib::ustring label) {
// When there is at least 1 choice, we add the arrow button // When there is at least 1 choice, we add the arrow button
if (images.size() == 1) { if (images.size() == 1) {
Gtk::Button* arrowButton = Gtk::manage( new Gtk::Button() ); Gtk::Button* arrowButton = Gtk::manage( new Gtk::Button() );
Gtk::Arrow* arrowObject = Gtk::manage( new Gtk::Arrow(Gtk::ARROW_DOWN, Gtk::SHADOW_NONE) ); RTImage* arrowImage = Gtk::manage( new RTImage("popuparrow.png") );
arrowButton->add(*arrowObject); //menuSymbol); arrowButton->add(*arrowImage); //menuSymbol);
arrowButton->set_relief (Gtk::RELIEF_NONE); arrowButton->set_relief (Gtk::RELIEF_NONE);
arrowButton->set_border_width (0); arrowButton->set_border_width (0);
buttonGroup->pack_start(*arrowButton,Gtk::PACK_SHRINK, 0); buttonGroup->pack_start(*arrowButton,Gtk::PACK_SHRINK, 0);