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

More bugfix from issue #3446

Browse Source
This commit is contained in:
Hombre 2016-10-23 21:05:23 +02:00
parent b2af94ac74
commit c1a6abbd43
7 changed files with 116 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rtdata/themes/RawTherapee.css
View File

@ -101,11 +101,14 @@ eventbox.frame {
border-color: #565656;
}
window decoration {
padding: 0;
margin: 0;
box-shadow: 0 0;
border-radius: 0 0 0 0;
scrollbar {
background-color: #303030;
}
scrollbar slider {
background-color: #808080;
}
scrollbar slider:hover {
background-color: #999999;
}
button {
@ -117,13 +120,31 @@ button {
button.flat {
background-image: none;
}
button.popupbutton-arrow {
min-width: 18px;
}
button:hover {
background-image: linear-gradient(#444444, #3E3E3E, #393939);
}
checkbutton > check {
background-image: linear-gradient(#343434, #2E2E2E, #292929);
}
checkbutton:hover > check {
background-image: linear-gradient(#444444, #3E3E3E, #393939);
}
radiobutton > radio {
background-image: linear-gradient(#343434, #2E2E2E, #292929);
}
radiobutton:hover > radio {
background-image: linear-gradient(#444444, #3E3E3E, #393939);
}
combobox {
min-height: 5px;
min-width: 5px;
margin-left: 2px;
}
box {
@ -136,7 +157,7 @@ box {
scale {
padding: 0;
min-height: 5px;
margin: 0 6px 0 6px; /* have to be half of "scale slider" >> "min-width" for horizontalmargin */
margin: 0 7px 0 0;
}
scale slider {
@ -144,6 +165,14 @@ scale slider {
min-width: 12px;
min-height: 12px;
margin: -6px;
background-image: linear-gradient(#343434, #2E2E2E, #292929);
}
scale slider:hover {
background-image: linear-gradient(#444444, #3E3E3E, #393939);
}
scale trough {
margin: 6px 6px; /* have to be half of "scale slider / min-width min-height" */
background-color: #2A2A2A;
}
/*.EditorTopPanel .button, .ToolBarPanelFileBrowser .button, .EditorZoomPanel .button {*/

4
rtgui/adjuster.cc
View File

@ -87,7 +87,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
reset->set_can_focus(false);
spin = Gtk::manage (new MySpinButton ());
setExpandAlignProperties(spin, false, false, Gtk::ALIGN_CENTER, !vlabel.empty() ? Gtk::ALIGN_BASELINE : Gtk::ALIGN_CENTER);
setExpandAlignProperties(spin, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
spin->set_input_purpose(Gtk::INPUT_PURPOSE_DIGITS);
reset->set_size_request (-1, spin->get_height() > MIN_RESET_BUTTON_HEIGHT ? spin->get_height() : MIN_RESET_BUTTON_HEIGHT);
@ -95,7 +95,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
slider = Gtk::manage (new MyHScale ());
setExpandAlignProperties(slider, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
slider->set_draw_value (false);
//slider->set_has_origin(false); // ------------------ This will remove the colored part on the left of the slider's knob
slider->set_has_origin(false); // ------------------ This will remove the colored part on the left of the slider's knob
if (vlabel.empty()) {
// No label, everything goes in a single row

8
rtgui/lockablecolorpicker.cc
View File

@ -45,6 +45,14 @@ void LockableColorPicker::updateBackBuffer ()
if (validity == Validity::INSIDE) {
Gtk::DrawingArea *iArea = cropWindow->getImageArea();
Glib::RefPtr<Pango::Context> pangoContext = iArea->get_pango_context ();
Pango::FontDescription fontd = pangoContext->get_font_description();
// set font family and size
fontd.set_family("sans");
fontd.set_size(8 * Pango::SCALE); // 8pt, will be scaled by Gtk depending on the screen's DPI
fontd.set_weight(Pango::WEIGHT_NORMAL);
pangoContext->set_font_description (fontd);
Glib::RefPtr<Pango::Layout> layout[3][2];
Glib::ustring s1, s2, s3;
PointerMotionListener* navigator = cropWindow->getPointerMotionListener ();

2
rtgui/mycurve.h
View File

@ -143,7 +143,7 @@ public:
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
void get_preferred_width_for_height_vfunc (int width, int &minimum_width, int &natural_width) const;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
};
class MyCurveIdleHelper

2
rtgui/navigator.cc
View File

@ -86,6 +86,7 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt
LAB_L->set_alignment(Gtk::ALIGN_END);
// set font family and size
/*
Glib::ustring fontname;
#ifdef WIN32
@ -128,6 +129,7 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt
position->get_style_context()->add_provider(cssProvider, GTK_STYLE_PROVIDER_PRIORITY_USER);
}
}
*/
// setup the tables
Gtk::Table* table0 = Gtk::manage (new Gtk::Table (1, 3)); //rows, cols The main table container

1
rtgui/popupcommon.cc
View File

@ -86,6 +86,7 @@ bool PopUpCommon::addEntry (const Glib::ustring& fileName, const Glib::ustring&
arrowButton->signal_button_release_event().connect_notify( sigc::mem_fun(*this, &PopUpCommon::showMenu) );
button->get_style_context()->add_class("Left");
arrowButton->get_style_context()->add_class("Right");
arrowButton->get_style_context()->add_class("popupbutton-arrow");
hasMenu = true;
}

12
rtgui/tonecurve.cc
View File

@ -113,6 +113,18 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
//---------Brightness / Contrast -------------------------
brightness = Gtk::manage (new Adjuster (M("TP_EXPOSURE_BRIGHTNESS"), -100, 100, 1, 0));
Glib::RefPtr<Gtk::CssProvider> cssProvider = Gtk::CssProvider::create();
if (cssProvider) {
try {
cssProvider->load_from_data("scale trough { background-image: linear-gradient(to right, #000 0%, #CCC 100%); }");
brightness->get_style_context()->add_provider(cssProvider, GTK_STYLE_PROVIDER_PRIORITY_USER);
} catch (Glib::Error &err) {
printf("Erreur: \"%s\"\n", err.what().c_str());
} catch (...) {
printf("Erreur inconnu !\n");
}
}
pack_start (*brightness);
contrast = Gtk::manage (new Adjuster (M("TP_EXPOSURE_CONTRAST"), -100, 100, 1, 0));
pack_start (*contrast);