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

Always show image dimensions below navigator preview, fixes #4359

Browse Source
This commit is contained in:
heckflosse
2018-02-04 18:55:21 +01:00
parent ff808c823b
commit b4227e1a02
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/navigator.cc
View File

@@ -38,6 +38,8 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt
mbox->set_name("Navigator"); mbox->set_name("Navigator");
previewWindow = Gtk::manage (new PreviewWindow ()); previewWindow = Gtk::manage (new PreviewWindow ());
mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2); mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);
dimension = Gtk::manage (new Gtk::Label ());
mbox->pack_start (*dimension, Gtk::PACK_SHRINK, 2);
position = Gtk::manage (new Gtk::Label ()); position = Gtk::manage (new Gtk::Label ());
mbox->pack_start (*position, Gtk::PACK_SHRINK, 2); mbox->pack_start (*position, Gtk::PACK_SHRINK, 2);
@@ -207,10 +209,9 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt
void Navigator::setInvalid (int fullWidth, int fullHeight) void Navigator::setInvalid (int fullWidth, int fullHeight)
{ {
if (fullWidth > 0 && fullHeight > 0) { if (fullWidth > 0 && fullHeight > 0) {
position->set_text (Glib::ustring::compose (M("NAVIGATOR_XY_FULL"), fullWidth, fullHeight)); dimension->set_text (Glib::ustring::compose (M("NAVIGATOR_XY_FULL"), fullWidth, fullHeight));
} else {
position->set_text (M("NAVIGATOR_XY_NA"));
} }
position->set_text (M("NAVIGATOR_XY_NA"));
R->set_text (M("NAVIGATOR_NA")); R->set_text (M("NAVIGATOR_NA"));
G->set_text (M("NAVIGATOR_NA")); G->set_text (M("NAVIGATOR_NA"));

1
rtgui/navigator.h
View File

@@ -37,6 +37,7 @@ private:
void cycleUnitsHSV (GdkEventButton *event); void cycleUnitsHSV (GdkEventButton *event);
protected: protected:
Gtk::Label* dimension;
Gtk::Label* position; Gtk::Label* position;
Gtk::Label *R, *G, *B; Gtk::Label *R, *G, *B;
Gtk::Label *H, *S, *V; Gtk::Label *H, *S, *V;