Fix gtk-qt-engine tab bars

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1259596 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

src/qt_qt_wrapper.cpp

@@ -2120,6 +2120,9 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
 	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*GtkToolbar*GtkToggleButton*");
 	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*GtkNotebook*GtkButton*");
 	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*GtkNotebook*GtkToggleButton*");
+
+	// Qt calls them tab boxes, GTK calls them notebooks (!??!?)  Either way they are a pain...
+	stream << parse_rc_string("GtkNotebook::tab-overlap = 1", "*");
 	
 	// This one may not work...
 	//insertIntProperty(rc_style, "GtkCheckButton", "indicator-size", tqApp->tqstyle().tqpixelMetric(TQStyle::PM_IndicatorHeight) );

src/qt_qt_wrapper.h

@@ -9,6 +9,7 @@
 #include <gtk/gtkprogressbar.h>
 
 // #define USE_NATIVE_GTK_BUTTON_DRAWING 1
+#define FORCE_RELOAD_THEMES_ON_STARTUP 1
 
 #ifdef __cplusplus
 extern "C" {

src/qt_rc_style.c

@@ -65,7 +65,11 @@ qtengine_rc_style_parse (GtkRcStyle *rc_style, GtkSettings *settings, GScanner *
 	guint               token;
 	
 	/* Sets Rc properties from QT settings */
+#ifdef FORCE_RELOAD_THEMES_ON_STARTUP
+	setRcProperties(rc_style, 1);
+#else
 	setRcProperties(rc_style, 0);
+#endif
 	
 	/* The rest of this keeps GTK happy - therefore I don't care what it does */
 	if (!scope_id)

src/qt_theme_draw.c

@@ -858,10 +858,10 @@ draw_box(GtkStyle * style,
 			
 			/* Now draw the tab -- tab position is also calculated in this function
 			   checkout drawTabFrame() for drawing tabbarbase. */
-			drawTabNG(window,style,state_type,x, y, width - 2, height, nb );
+			drawTabNG(window,style,state_type,x, y, width/*-2*/, height, nb );
 		}
 		else {
-			drawTab(window,style,state_type,x,y,width-2,height);
+			drawTab(window,style,state_type,x,y,width/*-2*/,height);
 		}
 		return;
 	}