summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qt_qt_wrapper.cpp3
-rw-r--r--src/qt_qt_wrapper.h1
-rw-r--r--src/qt_rc_style.c4
-rw-r--r--src/qt_theme_draw.c4
4 files changed, 10 insertions, 2 deletions
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 90e060a..3560df1 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/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) );
diff --git a/src/qt_qt_wrapper.h b/src/qt_qt_wrapper.h
index 5d5c804..d1cdc9e 100644
--- a/src/qt_qt_wrapper.h
+++ b/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" {
diff --git a/src/qt_rc_style.c b/src/qt_rc_style.c
index 9d9e4d3..3d4d95c 100644
--- a/src/qt_rc_style.c
+++ b/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)
diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
index 2ccdaf8..8e30d24 100644
--- a/src/qt_theme_draw.c
+++ b/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;
}