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

Gtk3 theme ready, Gtk2 stuff removed, slim mode removed, RT logo images enhanced.

Browse Source
This commit is contained in:
Beep6581
2015-11-17 02:52:38 +01:00
parent d26eaa174d
commit a9aa5308b5
90 changed files with 5127 additions and 8311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/mycurve.cc
View File

@@ -74,15 +74,15 @@ int MyCurve::calcDimensions ()
newRequestedW = newRequestedH = get_allocation().get_width();
if (leftBar && !bottomBar) {
newRequestedH -= getBarWidth() + CBAR_MARGIN - RADIUS;
newRequestedH -= CBAR_WIDTH + CBAR_MARGIN - RADIUS;
}
if (!leftBar && bottomBar) {
newRequestedH += getBarWidth() + CBAR_MARGIN - RADIUS;
newRequestedH += CBAR_WIDTH + CBAR_MARGIN - RADIUS;
}
graphW = newRequestedW - RADIUS - (leftBar ? (getBarWidth() + CBAR_MARGIN) : RADIUS);
graphH = newRequestedH - RADIUS - (bottomBar ? (getBarWidth() + CBAR_MARGIN) : RADIUS);
graphW = newRequestedW - RADIUS - (leftBar ? (CBAR_WIDTH + CBAR_MARGIN) : RADIUS);
graphH = newRequestedH - RADIUS - (bottomBar ? (CBAR_WIDTH + CBAR_MARGIN) : RADIUS);
graphX = newRequestedW - RADIUS - graphW;
graphY = RADIUS + graphH;
@@ -112,16 +112,16 @@ void MyCurve::get_preferred_height_for_width_vfunc (int width, int &minimum_heig
minimum_height = width;
if (leftBar && !bottomBar) {
minimum_height -= getBarWidth() + CBAR_MARGIN - RADIUS;
minimum_height -= CBAR_WIDTH + CBAR_MARGIN - RADIUS;
}
if (!leftBar && bottomBar) {
minimum_height += getBarWidth() + CBAR_MARGIN - RADIUS;
minimum_height += CBAR_WIDTH + CBAR_MARGIN - RADIUS;
}
/*
graphW = width - RADIUS - (leftBar ? (getBarWidth()+CBAR_MARGIN) : RADIUS);
graphH = minimum_height - RADIUS - (bottomBar ? (getBarWidth()+CBAR_MARGIN) : RADIUS);
graphW = width - RADIUS - (leftBar ? (CBAR_WIDTH+CBAR_MARGIN) : RADIUS);
graphH = minimum_height - RADIUS - (bottomBar ? (CBAR_WIDTH+CBAR_MARGIN) : RADIUS);
graphX = width - RADIUS - graphW;
graphY = RADIUS + graphH;
*/