More GUI touch up

- Grid lines of the Histogram are now white @ 35% opacity
- Chromaticity histogram is now black
- Frame of the Navigator is now rendered
- DCP's option is now in a single column like in master, was too wide
before
This commit is contained in:
Hombre
2016-01-17 18:28:35 +01:00
parent 93d01f3a82
commit 57b1edb84d
3 changed files with 10 additions and 14 deletions

View File

@@ -1062,19 +1062,15 @@ void HistogramArea::updateBackBuffer ()
if (needLuma && !rawMode) { if (needLuma && !rawMode) {
drawCurve(cr, lhist, realhistheight, w, h); drawCurve(cr, lhist, realhistheight, w, h);
cr->set_source_rgb (0.75, 0.75, 0.75); cr->set_source_rgb (0.65, 0.65, 0.65);
cr->fill_preserve (); cr->fill ();
cr->set_source_rgb (0.5, 0.5, 0.5);
cr->stroke ();
drawMarks(cr, lhist, realhistheight, w, ui, oi); drawMarks(cr, lhist, realhistheight, w, ui, oi);
} }
if (needChroma && !rawMode) { if (needChroma && !rawMode) {
drawCurve(cr, chist, realhistheight, w, h); drawCurve(cr, chist, realhistheight, w, h);
cr->set_source_rgb (0.6, 0.6, 0.6); cr->set_source_rgb (0., 0., 0.);
// cr->fill_preserve ();
// cr->set_source_rgb (0.2, 0.2, 0.1);
cr->stroke (); cr->stroke ();
drawMarks(cr, chist, realhistheight, w, ui, oi); drawMarks(cr, chist, realhistheight, w, ui, oi);
@@ -1105,8 +1101,7 @@ void HistogramArea::updateBackBuffer ()
} }
} }
Gdk::RGBA c = style->get_border_color(Gtk::STATE_FLAG_NORMAL); cr->set_source_rgba (1., 1., 1., 0.35);
cr->set_source_rgb (c.get_red(), c.get_green(), c.get_blue());
cr->set_line_width (1.0); cr->set_line_width (1.0);
cr->set_antialias(Cairo::ANTIALIAS_NONE); cr->set_antialias(Cairo::ANTIALIAS_NONE);

View File

@@ -132,11 +132,11 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
ckbApplyBaselineExposureOffset->set_tooltip_text (M("TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP")); ckbApplyBaselineExposureOffset->set_tooltip_text (M("TP_ICM_APPLYBASELINEEXPOSUREOFFSET_TOOLTIP"));
setExpandAlignProperties(ckbApplyBaselineExposureOffset, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties(ckbApplyBaselineExposureOffset, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
dcpGrid->attach_next_to(*ckbToneCurve, Gtk::POS_LEFT, 1, 1); dcpGrid->attach_next_to(*dcpIllGrid, Gtk::POS_BOTTOM, 1, 1);
dcpGrid->attach_next_to(*ckbApplyLookTable, *ckbToneCurve, Gtk::POS_RIGHT, 1, 1); dcpGrid->attach_next_to(*ckbToneCurve, Gtk::POS_BOTTOM, 1, 1);
dcpGrid->attach_next_to(*ckbApplyHueSatMap, *ckbToneCurve, Gtk::POS_BOTTOM, 1, 1); dcpGrid->attach_next_to(*ckbApplyHueSatMap, Gtk::POS_BOTTOM, 1, 1);
dcpGrid->attach_next_to(*ckbApplyBaselineExposureOffset, *ckbApplyHueSatMap, Gtk::POS_RIGHT, 1, 1); dcpGrid->attach_next_to(*ckbApplyLookTable, Gtk::POS_BOTTOM, 1, 1);
dcpGrid->attach_next_to(*dcpIllGrid, *ckbToneCurve, Gtk::POS_TOP, 2, 1); dcpGrid->attach_next_to(*ckbApplyBaselineExposureOffset, Gtk::POS_BOTTOM, 1, 1);
dcpFrame->add(*dcpGrid); dcpFrame->add(*dcpGrid);
dcpFrame->set_sensitive(false); dcpFrame->set_sensitive(false);

View File

@@ -88,6 +88,7 @@ void PreviewWindow::updatePreviewImage ()
} }
} }
} }
style->render_frame (cc, 0, 0, W, H);
} }
void PreviewWindow::setPreviewHandler (PreviewHandler* ph) void PreviewWindow::setPreviewHandler (PreviewHandler* ph)