summaryrefslogtreecommitdiffstats
path: root/tdegtk/tdegtk-theme.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-11-18 20:22:08 -0600
committerTimothy Pearson <[email protected]>2012-11-18 20:22:08 -0600
commit2f93dfb8bfc66c98675499cde3f54fe90049e3ce (patch)
tree85dfa18295133dfac2b10ffa240f1150023b780c /tdegtk/tdegtk-theme.cpp
parentfe3024a81620277cd180d3ade2c9c48207696b10 (diff)
downloadgtk3-tqt-engine-2f93dfb8bfc66c98675499cde3f54fe90049e3ce.tar.gz
gtk3-tqt-engine-2f93dfb8bfc66c98675499cde3f54fe90049e3ce.zip
Fix drawing problems on GTK 3.7
Diffstat (limited to 'tdegtk/tdegtk-theme.cpp')
-rw-r--r--tdegtk/tdegtk-theme.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp
index 118b173..446480b 100644
--- a/tdegtk/tdegtk-theme.cpp
+++ b/tdegtk/tdegtk-theme.cpp
@@ -494,6 +494,7 @@ void writeGtkThemeControlFile(int forceRecreate) {
GtkSettingsValue svalue;
if (gtksettings) {
g_object_set(gtksettings, "gtk-alternative-button-order", TRUE, NULL);
+ g_object_set(gtksettings, "gtk-primary-button-warps-slider", FALSE, NULL);
g_object_set(gtksettings, "gtk-button-images", tde_showIconsOnPushButtons, NULL);
g_object_set(gtksettings, "gtk-menu-popup-delay", tqApp->style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay), NULL);
g_object_set(gtksettings, "gtk-icon-sizes", iconSettingsString.ascii(), NULL);
@@ -674,6 +675,11 @@ void writeGtkThemeControlFile(int forceRecreate) {
stream.unsetDevice();
themeFile.close();
}
+
+ if (gtk3TQtDebug) {
+ // Load possibly modified theme control file before writing a new one
+ gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1());
+ }
themeFile.open(IO_WriteOnly | IO_Truncate);
stream.setDevice(TQT_TQIODEVICE(&themeFile));
@@ -725,6 +731,12 @@ void writeGtkThemeControlFile(int forceRecreate) {
// Work around problems detailed in upstream GTK bug #687677
stream << parse_rc_string(TQString("-GtkComboBox-shadow-type: in"), "*");
+ stream << parse_rc_string(TQString("-GtkScrolledWindow-scrollbars-within-bevel: 1"), "*");
+ stream << parse_rc_string(TQString("-GtkScrolledWindow-scrollbar-spacing: 0px"), "*");
+ stream << parse_rc_string(TQString("border-style: inset"), "GtkScrolledWindow");
+ stream << parse_rc_string("border-width: " + TQString::number(2) + "px " + TQString::number(2) + "px " + TQString::number(2) + "px " + TQString::number(2) + "px", "GtkScrolledWindow");
+ stream << parse_rc_string("padding: " + TQString::number(0) + "px " + TQString::number(0) + "px " + TQString::number(0) + "px " + TQString::number(0) + "px", "GtkScrolledWindow");
+
stream << parse_rc_string("-GtkComboBox-arrow-size: " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ArrowSize)), "*");
stream << parse_rc_string("-GtkComboBox-arrow-scaling: 0", "*");