Attachment 72856 Details for Bug 143263

[patch] gtk-qt-engine patch

fix-slider.patch (text/plain), 1.83 KB, created by Lubos Lunak on 2006-03-14 20:56:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2006-03-14 20:56:55 UTC

Size: 1.83 KB

patch

obsolete

>--- src/qt_qt_wrapper.cpp.sav	2006-02-03 14:50:05.000000000 +0100
>+++ src/qt_qt_wrapper.cpp	2006-03-14 21:49:33.000000000 +0100
>@@ -1265,26 +1265,12 @@ void drawSlider(GdkWindow * window, GtkS
> 	if (!gtkQtEnable)
> 		return;
> 
>-	int w1, h1;
> 	meepSlider->setBackgroundOrigin(QWidget::ParentOrigin);
> 	
> 	meepSlider->setOrientation((orientation == GTK_ORIENTATION_HORIZONTAL) ? Qt::Horizontal : Qt::Vertical);
> 	meepSlider->setEnabled(state != GTK_STATE_INSENSITIVE);
> 
>-	/* This can be draw in two ways -- 
>-		If the slider is horizontal -- we can resize the slider to height using the sizeHint() (equivalent to using Qt's guidelines regarding height ) and (1)scale it later to GTK's sizes which will work for all slider sizes but will look in GTK as if the slider has been crushed or (2)else we can draw the slider using the height hint provided by Qt 
>-		.. and vice versa for vertical slider */
>-	if (w > h)
>-	{
>-		h1 = meepSlider->sizeHint().height();
>-		w1 = w;
>-	}
>-	else
>-	{
>-		h1 = h;
>-		w1 = meepSlider->sizeHint().width();
>-	}
>-	meepSlider->setGeometry(x, y, w1, h1);
>+	meepSlider->setGeometry(x, y, w, h);
> 	meepSlider->setMinValue(0);
> 	meepSlider->setMaxValue(100);
> 	
>--- src/qt_theme_draw.c.sav	2006-02-03 04:13:09.000000000 +0100
>+++ src/qt_theme_draw.c	2006-03-14 21:50:17.000000000 +0100
>@@ -1204,9 +1204,9 @@ draw_slider(GtkStyle * style,
> 	{
> 		GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget));
> 		if (orientation == GTK_ORIENTATION_VERTICAL)
>-			drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height);
>+			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height);
> 		else
>-			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2);
>+			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height);
> 		return;
> 	}
> }

Actions: View | Diff

Attachments on bug 143263: 72856