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

Reintroduce some set_border_width to circumvent some Gtk bugs.

Browse Source 
Also fix a bug that let you grab the first and last point of the
diagonal curve more easily now, when they are at their left/right
extremum.
This commit is contained in:
Hombre
2016-02-29 22:08:05 +01:00
parent 3577d87862
commit 830c58877f
8 changed files with 38 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

439
rtdata/themes/RawTherapee-bak.css
View File

@@ -1,439 +0,0 @@
/*
This file is part of RawTherapee.
Copyright (c) 2015 DrSlony
Copyright (c) 2016 Hombre
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
RawTherapee is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
* {
color: #AAAAAA;
}
.view:selected {
color: #262626;
background-color: #AAAAAA
}
/* The Places and Dir browser panels */
.view {
background-color: #262626;
}
/* The headers of these panels */
.view .button {
background-color: #363636;
padding: 2px;
}
.plainback {
background-color: #404040;
}
box {
border-width: 0;
border-style: none;
border-radius: 0;
margin: 0;
padding: 0;
}
grid {
margin: 2px;
padding: 0;
border-width: 0;
border-style: none;
border-radius: 0;
}
/* Affects all frames except in the toolbox */
frame {
border-width: 0;
border-color: #303030;
border-radius: 0;
border-style: solid;
/*border-style: none none none solid;*/
padding: 4px;
}
frame > label {
color: #D8D8D8;
}
#FileBrowser {
padding: 10px;
margin: 10px;
}
/* Frames in Preferences */
#PrefNotebook frame {
background-color: #3B3B3B;
border: 1px solid #505050;
border-radius: 4px;
}
/* Frames in the toolbox. Not MyExpander frames. */
eventbox .frame {
border-color: #565656;
}
/*.EditorTopPanel .button, .ToolBarPanelFileBrowser .button, .EditorZoomPanel .button {*/
.button {
padding: 1px;
margin: 1px;
}
/* Adjusters */
.text-button {
padding: 0;
}
/* Any text-button which is a real button, unlike Slider label */
.text-button.button {
padding: 4px;
}
.separator {
color: #363636;
}
progressbar {
-progressbar-min-vertical-bar-width: 10;
-progressbar-min-horizontal-bar-height: 10;
}
drawingarea {
border-radius: 0;
padding: 0;
margin: 0;
background-color: #363636;
border: 1px solid #252525;
}
drawingarea:selected {
background-color: #565656;
border-radius: 10px;
}
image {
padding: 1px;
}
/* Vertical group of buttons in 1 column */
button.Top {
border-radius: 10px 4px 0 0;
border-style: solid solid none solid;
margin-bottom: 0;
}
button.MiddleV {
border-radius: 0;
border-style: none solid none solid;
margin-top: 0;
margin-bottom: 0;
}
button.Bottom {
border-radius: 0 0 4px 4px;
border-style: none solid solid solid;
margin-top: 0;
}
/* end */
/* Horizontal group of buttons in 1 row */
button.Left {
border-radius: 4px 0 0 4px;
border-style: solid none solid solid;
margin-right: 0;
}
button.MiddleH {
border-radius: 0;
border-style: solid none solid none;
margin-left: 0;
margin-right: 0;
}
button.Right {
border-radius: 0 4px 4px 0;
border-style: solid solid solid none;
margin-left: 0;
}
/* end */
/* [1.23[-][+]] */
entry, spinbutton {
padding: 1px;
background-color: #262626;
}
entry:insensitive, spinbutton:insensitive {
background-color: #363636;
}
entry:hover, spinbutton:hover {
background-color: #565656;
}
entry:selected {
color: #262626;
background-color: #AAAAAA;
}
/* Context menus */
menu {
background-color: #262626;
color: #909090;
}
/* Context menu item */
.menuitem {
padding: 2px;
}
#MyExpander {
margin: 10px;
padding: 5px;
}
/* Tool background */
#ExpanderBox {
background-color: #363636;
border-width: 1px;
border-style: solid;
border-color: #252525;
border-radius: 4px;
margin: 9px;
padding: 4px;
}
#ExpanderBox drawingarea {
background-color: #363636;
}
#ExpanderBox frame {
background-color: #3B3B3B;
border: 1px solid #313131;
border-radius: 4px;
margin: 3px;
padding: 2px;
}
#ExpanderBox frame drawingarea {
background-color: #3B3B3B;
}
#ExpanderBox frame frame {
background-color: #414141;
border: 1px solid #373737;
border-radius: 4px;
margin: 3px;
padding: 2px;
}
#ExpanderBox frame frame drawingarea {
background-color: #414141;
}
/* Sub-tool (MyExpander) background */
#ExpanderBox2 {
background-color: #3B3B3B;
border: 1px solid #2A2A2A;
border-radius: 4px;
margin: 9px;
padding: 4px;
}
#ExpanderBox2 drawingarea {
background-color: #3B3B3B;
}
#ExpanderBox2 frame {
background-color: #414141;
border: 1px solid #373737;
border-radius: 4px;
}
#ExpanderBox2 frame drawingarea {
background-color: #414141;
}
#ExpanderBox2 frame frame {
background-color: #474747;
border: 1px solid #3D3D3D;
border-radius: 4px;
margin: 3px;
padding: 2px;
}
#ExpanderBox2 frame frame drawingarea {
background-color: #474747;
}
#MyExpanderTitle {
margin: 5px;
padding: 3px 1px 3px 1px;
font-size: 120%;
}
#MyExpanderTitle label {
color: #CCCCCC;
}
#MyExpanderTitle:hover {
background-color: #202020;
}
#MyExpanderTitle:hover label {
color: #D8D8D8;
}
#ExpanderBox2 separator, #ExpanderBox3 separator {
color: #292929;
}
/* Editor tab button */
#MainNotebook > grid label, #MainNotebook > grid image {
/* OK */
padding: 1px;
}
/* File Browser right side tabs - Toolbox, Inspector, Fast Export, Filter */
notebook tab {
background-color: #383838;
border-width: 1px;
border-style: none;
border-color: #262626;
border-radius: 0;
padding: 3px;
}
notebook tab:hover {
background-color: #505050;
}
notebook tab:active {
border-width: 5px;
border-color: #989898;
}
/* Get rid of shitty notebook header shadow */
notebook.top tab {
border-bottom-style: solid;
padding-bottom: 8px;
}
notebook.right tab {
border-left-style: solid;
padding-left: 8px;
}
notebook.bottom tab {
border-top-style: solid;
padding-top: 8px;
}
notebook.left tab {
border-right-style: solid;
padding-right: 8px;
}
/* Get rid of notebook frame border - too many borders */
notebook.top.header, notebook.right.header, notebook.bottom.header, notebook.left.header {
box-shadow: none;
border-width: 1px;
border-color: #262626;
border-style: none;
border-radius: 0;
background-color: #383838;
padding: 0;
}
/* Get rid of notebook header border - too many borders */
notebook.top.header {
/* OK */
border-bottom-style: solid;
}
notebook.right.header {
/* OK */
border-left-style: solid;
}
notebook.bottom.header {
/* OK */
border-top-style: solid;
}
notebook.left.header {
/* OK */
border-right-style: solid;
}
notebook.frame {
/* OK */
border-radius: 0;
border-style: none;
}
/* Pad notebooks, makes the other borders look nicer */
notebook {
/* OK */
background-color: #484848;
padding: 0;
}
#MainNotebook.header {
/* OK */
background-color: #2A2A2A;
}
#MainNotebook > tab {
/* OK */
background-color: #2A2A2A;
}
#MainNotebook > tab:hover {
/* OK */
background-color: #505050;
}
#MainNotebook > tab:active {
/* OK */
border-color: #989898;
}
#RightNotebook.header {
/* OK */
background-color: #2A2A2A;
}
#RightNotebook > tab {
/* OK */
background-color: #2A2A2A;
}
#RightNotebook > tab:hover {
/* OK */
background-color: #505050;
}
#RightNotebook > tab:active {
/* OK */
border-color: #989898;
}
/* All tool panels have a frame except for Meta which unlike the rest is a notebook itself.
* So we use CSS to make it look like a frame. */
#MetaPanelNotebook.frame {
border: 1px solid #262626;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-top-left-radius: 0;
border-top-right-radius: 0;
border-top-width: 0;
}
#MetaPanelNotebook.header {
border: 1px solid #262626;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-width: 0;
padding: 5px;
margin: 5px;
}

17
rtdata/themes/RawTherapee.css
View File

@@ -115,8 +115,6 @@ GtkProgressBar {
GtkDrawingArea {
border-radius: 0;
padding: 0;
margin: 0;
background-color: #363636;
border: 1px solid #252525;
}
@@ -208,8 +206,8 @@ GtkMenu {
background-color: #363636;
border-width: 1px;
border-style: solid;
border-color: #252525;
border-radius: 4px;
border-color: #252525;
margin: 9px;
padding: 4px;
}
@@ -220,8 +218,10 @@ GtkMenu {
#ExpanderBox GtkFrame {
background-color: #3B3B3B;
border: 1px solid #313131;
border-style: solid;
border-width: 1px;
border-radius: 4px;
border-color: #313131;
margin: 3px;
padding: 2px;
}
@@ -230,7 +230,7 @@ GtkMenu {
background-color: #3B3B3B;
}
#ExpanderBox GtkFrame GtkFrame {
#ExpanderBox GtkFrame GtkFrame {
background-color: #414141;
border: 1px solid #373737;
border-radius: 4px;
@@ -238,7 +238,7 @@ GtkMenu {
padding: 2px;
}
#ExpanderBox GtkFrame GtkFrame GtkDrawingArea {
#ExpanderBox GtkFrame GtkFrame GtkDrawingArea {
background-color: #414141;
}
@@ -259,6 +259,8 @@ GtkMenu {
background-color: #414141;
border: 1px solid #373737;
border-radius: 4px;
margin: 3px;
padding: 2px;
}
#ExpanderBox2 GtkFrame GtkDrawingArea {
@@ -437,3 +439,6 @@ GtkNotebook {
margin: 5px;
}
.tooltip {
padding: 0;
}

6
rtgui/guiutils.cc
View File

@@ -528,6 +528,7 @@ void ExpanderBox::setLevel(int level)
void ExpanderBox::updateStyle()
{
set_border_width(2);
}
void ExpanderBox::show_all()
@@ -560,13 +561,13 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
child(NULL), headerWidget(NULL), statusImage(NULL),
label(NULL), useEnabled(useEnabled)
{
set_spacing(0);
set_name("MyExpander");
set_can_focus(false);
headerHBox = Gtk::manage( new Gtk::HBox());
headerHBox->set_can_focus(false);
if (useEnabled) {
statusImage = Gtk::manage(new Gtk::Image(disabledPBuf));
imageEvBox = Gtk::manage(new Gtk::EventBox());
@@ -590,6 +591,7 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
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 making it below the child, they will get the events first.
titleEvBox->set_can_focus(false);
@@ -689,7 +691,9 @@ bool MyExpander::on_enter_leave_enable (GdkEventCrossing* event)
void MyExpander::updateStyle()
{
headerHBox->set_spacing(2);
headerHBox->set_border_width(1);
set_spacing(0);
set_border_width(0);
if (expBox) {
expBox->updateStyle();

9
rtgui/mydiagonalcurve.cc
View File

@@ -756,7 +756,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
// Pointer can LEAVE even when dragging the point, so we don't modify the cursor in this case
// The cursor will have to LEAVE another time after the drag...
if (!buttonPressed)
if (!buttonPressed) {
if (grab_point == -1) {
new_type = CSArrow;
lit_point = -1;
@@ -764,6 +764,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
setDirty(true);
draw (lit_point);
}
}
retval = true;
break;
@@ -786,7 +787,10 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
int previous_lit_point = lit_point;
findClosestPoint();
if (cursorX < 0 || cursorX > graphW || cursorY < 0 || cursorY > graphH) {
{
int extendedGraphW = graphW + RADIUS + 1;
int extendedGraphH = graphH + RADIUS + 1;
if (cursorX < -RADIUS || cursorX > extendedGraphW || cursorY < -RADIUS || cursorY > extendedGraphH) {
// the cursor has left the graph area
new_type = CSArrow;
lit_point = -1;
@@ -799,6 +803,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
new_type = CSPlus;
lit_point = -1;
}
}
if (lit_point != previous_lit_point) {
setDirty(true);

3
rtgui/profilepanel.cc
View File

@@ -52,6 +52,7 @@ ProfilePanel::ProfilePanel () : storedPProfile(NULL), lastFilename(""), imagePat
fillMode->add( options.filledProfile ? *profileFillModeOnImage : *profileFillModeOffImage );
fillMode->signal_toggled().connect ( sigc::mem_fun(*this, &ProfilePanel::profileFillModeToggled) );
fillMode->set_tooltip_text(M("PROFILEPANEL_MODE_TIP"));
fillMode->set_margin_right(2);
setExpandAlignProperties(fillMode, false, true, Gtk::ALIGN_START, Gtk::ALIGN_FILL);
// Create the Combobox
@@ -64,9 +65,11 @@ ProfilePanel::ProfilePanel () : storedPProfile(NULL), lastFilename(""), imagePat
pack_start (*hgrid, Gtk::PACK_SHRINK, 4);
load = Gtk::manage (new Gtk::Button ());
load->add (*Gtk::manage (new RTImage ("gtk-open.png")));
load->get_style_context()->add_class("Left");
load->set_margin_left(2);
setExpandAlignProperties(load, false, true, Gtk::ALIGN_END, Gtk::ALIGN_FILL);
save = Gtk::manage (new Gtk::Button ());
save->add (*Gtk::manage (new RTImage ("gtk-save-large.png")));

3
rtgui/retinex.cc
View File

@@ -24,8 +24,7 @@ Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL")
Gtk::VBox * retinexVBox = Gtk::manage ( new Gtk::VBox());
retinexVBox->set_spacing (2);
Gtk::VBox * settingsVBox = Gtk::manage ( new Gtk::VBox());
settingsVBox->set_spacing (2);
Gtk::VBox * settingsVBox = Gtk::manage ( new ToolParamBlock());
dhbox = Gtk::manage (new Gtk::HBox ());
labmdh = Gtk::manage (new Gtk::Label (M ("TP_RETINEX_METHOD") + ":"));

2
rtgui/toolpanel.cc
View File

@@ -31,6 +31,7 @@ ToolVBox::ToolVBox()
void ToolVBox::updateStyle()
{
set_spacing(1); // Vertical space between tools
set_border_width(3); // Space separating the tab's frame and the tools
}
void ToolVBox::on_style_updated ()
@@ -46,6 +47,7 @@ ToolParamBlock::ToolParamBlock()
void ToolParamBlock::updateStyle()
{
set_spacing(2); // Vertical space between parameters in a single tool
set_border_width(5); // Space separating the parameters of a tool and its surrounding frame
}
void ToolParamBlock::on_style_updated ()

27
rtgui/wavelet.cc
View File

@@ -106,8 +106,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
enableFinalConn = expfinal->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expfinal) );
// Wavelet Settings
settingsVBox = Gtk::manage (new Gtk::VBox());
settingsVBox->set_spacing(2);
settingsVBox = Gtk::manage (new ToolParamBlock());
strength = Gtk::manage (new Adjuster (M("TP_WAVELET_STRENGTH"), 0, 100, 1, 100));
strength->setAdjusterListener (this);
@@ -199,8 +198,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
settingsVBox->pack_start(*levdirSubHBox);
// Contrast
Gtk::VBox * levBox = Gtk::manage (new Gtk::VBox());
levBox->set_spacing(2);
Gtk::VBox * levBox = Gtk::manage (new ToolParamBlock());
Gtk::HBox * buttonBox = Gtk::manage (new Gtk::HBox(true, 10));
@@ -282,8 +280,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
levBox->pack_start(*contrastSHFrame);
// Chromaticity
Gtk::VBox * chBox = Gtk::manage (new Gtk::VBox());
chBox->set_spacing(2);
Gtk::VBox * chBox = Gtk::manage (new ToolParamBlock());
ctboxch = Gtk::manage (new Gtk::HBox ());
labmch = Gtk::manage (new Gtk::Label (M("TP_WAVELET_CHTYPE") + ":"));
@@ -362,8 +359,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
}
// Toning
Gtk::VBox * tonBox = Gtk::manage (new Gtk::VBox());
tonBox->set_spacing(2);
Gtk::VBox * tonBox = Gtk::manage (new ToolParamBlock());
opaCurveEditorG = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_COLORT"));
opaCurveEditorG->setCurveListener (this);
@@ -392,8 +388,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
tonBox->pack_start( *opacityCurveEditorG, Gtk::PACK_SHRINK, 2);
// Denoise and Refine
Gtk::VBox * noiseBox = Gtk::manage (new Gtk::VBox());
noiseBox->set_spacing(2);
Gtk::VBox * noiseBox = Gtk::manage (new ToolParamBlock());
linkedg = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_LINKEDG")));
linkedg->set_active (true);
@@ -422,8 +417,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
noiseBox->pack_start( *level3noise, Gtk::PACK_SHRINK, 0);
// Edge Sharpness
Gtk::VBox * edgBox = Gtk::manage (new Gtk::VBox());
edgBox->set_spacing(2);
Gtk::VBox * edgBox = Gtk::manage (new ToolParamBlock());
edgval = Gtk::manage ( new Adjuster (M("TP_WAVELET_EDVAL"), 0, 100, 1, 0) );
edgval->setAdjusterListener(this);
@@ -564,8 +558,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
edgBox->pack_start(*ctboxES);
// Gamut
Gtk::VBox * conBox = Gtk::manage (new Gtk::VBox());
conBox->set_spacing(2);
Gtk::VBox * conBox = Gtk::manage (new ToolParamBlock());
median = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_MEDI")));
median->set_active (true);
@@ -601,8 +594,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
conBox->pack_start(*avoid);
// Residual Image
Gtk::VBox * resBox = Gtk::manage (new Gtk::VBox());
resBox->set_spacing(2);
Gtk::VBox * resBox = Gtk::manage (new ToolParamBlock());
rescon = Gtk::manage (new Adjuster (M("TP_WAVELET_RESCON"), -100, 100, 1, 0));
rescon->setAdjusterListener (this);
@@ -849,8 +841,7 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
tmr->set_tooltip_text (M("TP_WAVELET_BALCHRO_TOOLTIP"));
tmrConn = tmr->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::tmrToggled) );
Gtk::VBox * finalBox = Gtk::manage (new Gtk::VBox());
finalBox->set_spacing(2);
Gtk::VBox * finalBox = Gtk::manage (new ToolParamBlock());
finalBox->pack_start (*ctboxBA);
finalBox->pack_start(*balance);