|
|
@ -1227,12 +1227,35 @@ void drawScrollBarSlider(GdkWindow* window, GtkStyle* style, GtkStateType state,
|
|
|
|
|
|
|
|
|
|
|
|
int wCorrected = w;
|
|
|
|
int wCorrected = w;
|
|
|
|
int hCorrected = h;
|
|
|
|
int hCorrected = h;
|
|
|
|
|
|
|
|
int xOffset = 0;
|
|
|
|
|
|
|
|
int yOffset = 0;
|
|
|
|
if (isDomino)
|
|
|
|
if (isDomino)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
wCorrected = w + 14;
|
|
|
|
wCorrected = w + 14;
|
|
|
|
else
|
|
|
|
else
|
|
|
|
hCorrected = h + 14;
|
|
|
|
hCorrected = h + 14;
|
|
|
|
|
|
|
|
} else if (isKeramik) {
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL) {
|
|
|
|
|
|
|
|
wCorrected = w + 3;
|
|
|
|
|
|
|
|
hCorrected = h - 1;
|
|
|
|
|
|
|
|
yOffset = 1;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
wCorrected = w - 1;
|
|
|
|
|
|
|
|
hCorrected = h + 3;
|
|
|
|
|
|
|
|
xOffset = 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mozillaFix) {
|
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL) {
|
|
|
|
|
|
|
|
hCorrected-= 2;
|
|
|
|
|
|
|
|
wCorrected-= 1;
|
|
|
|
|
|
|
|
yOffset+= 1;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
wCorrected-= 2;
|
|
|
|
|
|
|
|
hCorrected-= 1;
|
|
|
|
|
|
|
|
xOffset+= 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
TQPixmap pixmap(wCorrected, hCorrected);
|
|
|
|
TQPixmap pixmap(wCorrected, hCorrected);
|
|
|
|
TQPainter painter(&pixmap);
|
|
|
|
TQPainter painter(&pixmap);
|
|
|
@ -1294,7 +1317,7 @@ void drawScrollBarSlider(GdkWindow* window, GtkStyle* style, GtkStateType state,
|
|
|
|
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, endsSkip, x, y, w, h-1);
|
|
|
|
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, endsSkip, x, y, w, h-1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
|
|
|
|
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x+xOffset, y+yOffset, w, h);
|
|
|
|
g_object_unref(pix);
|
|
|
|
g_object_unref(pix);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|