Attachment #72856 for bug #143263

View | Details | Raw Unified | Return to bug 143263
Collapse All | Expand All




	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);

	meepSlider->setGeometry(x, y, w, h);
		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->setMinValue(0);
	meepSlider->setMaxValue(100);
	

Lines 1204-1212 draw_slider(GtkStyle * style, Link Here

(-)src/qt_theme_draw.c.sav (-2 / +2 lines)
1204	{	1204	{
1205	GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget));	1205	GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget));
1206	if (orientation == GTK_ORIENTATION_VERTICAL)	1206	if (orientation == GTK_ORIENTATION_VERTICAL)
1207	drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height);	1207	drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height);
1208	else	1208	else
1209	drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2);	1209	drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height);
1210	return;	1210	return;
1211	}	1211	}
1212	}	1212	}

Return to bug 143263

Lines 1265-1290 void drawSlider(GdkWindow * window, GtkS Link Here

(-)src/qt_qt_wrapper.cpp.sav (-15 / +1 lines)
1265	if (!gtkQtEnable)	1265	if (!gtkQtEnable)
1266	return;	1266	return;
1267		1267
1268	int w1, h1;
1269	meepSlider->setBackgroundOrigin(QWidget::ParentOrigin);	1268	meepSlider->setBackgroundOrigin(QWidget::ParentOrigin);
1270		1269
1271	meepSlider->setOrientation((orientation == GTK_ORIENTATION_HORIZONTAL) ? Qt::Horizontal : Qt::Vertical);	1270	meepSlider->setOrientation((orientation == GTK_ORIENTATION_HORIZONTAL) ? Qt::Horizontal : Qt::Vertical);
1272	meepSlider->setEnabled(state != GTK_STATE_INSENSITIVE);	1271	meepSlider->setEnabled(state != GTK_STATE_INSENSITIVE);
1273		1272
1274	/* This can be draw in two ways --	1273	meepSlider->setGeometry(x, y, w, h);
1275	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
1276	.. and vice versa for vertical slider */
1277	if (w > h)
1278	{
1279	h1 = meepSlider->sizeHint().height();
1280	w1 = w;
1281	}
1282	else
1283	{
1284	h1 = h;
1285	w1 = meepSlider->sizeHint().width();
1286	}
1287	meepSlider->setGeometry(x, y, w1, h1);
1288	meepSlider->setMinValue(0);	1274	meepSlider->setMinValue(0);
1289	meepSlider->setMaxValue(100);	1275	meepSlider->setMaxValue(100);
1290		1276