From d2d0260170fa062dc6fb9261bb6d9fb8afd33711 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 24 Oct 2011 23:21:18 +0000
Subject: Fix menu bar drawing failures on Firefox v4+ and Thunderbird when
 used with the GTK Qt Theme Engine This partially resolves Bug 546

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1260478 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/qt_qt_wrapper.cpp | 4 ++--
 src/qt_qt_wrapper.h   | 1 +
 src/qt_theme_draw.c   | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 20dcee7..1dcfa25 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -53,7 +53,6 @@
 #define RC_CACHE_VERSION TQString("1")
 
 bool gtkQtEnable = false;
-bool mozillaFix = false;
 bool tqAppOwner = false;
 gboolean tde_showIconsOnPushButtons = false;
 
@@ -96,6 +95,7 @@ int isDomino;
 int isPolyester;
 int eclipseFix;
 int openOfficeFix;
+int mozillaFix;
 int gtkQtDebug;
 
 Atom kipcCommAtom;
@@ -335,7 +335,7 @@ void createTQApp()
 #endif // USE_FREEBSD
 #endif // USE_SOLARIS
 
-	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox"));
+	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird"));
 
 	openOfficeFix = (cmdLine.endsWith("soffice.bin"))
 	              | (cmdLine.endsWith("swriter.bin"))
diff --git a/src/qt_qt_wrapper.h b/src/qt_qt_wrapper.h
index 026c7f9..d1bf80c 100644
--- a/src/qt_qt_wrapper.h
+++ b/src/qt_qt_wrapper.h
@@ -74,6 +74,7 @@ extern int isAlloy;
 extern int isDomino;
 extern int isPolyester;
 extern int openOfficeFix;
+extern int mozillaFix;
 extern int gtkQtDebug;
 
 #ifdef  __cplusplus
diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c
index 02e462f..885a836 100644
--- a/src/qt_theme_draw.c
+++ b/src/qt_theme_draw.c
@@ -702,7 +702,9 @@ draw_box(GtkStyle * style,
 	if (DETAIL("menubar"))
 	{
 		if (openOfficeFix == 1)
-			 parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+			parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+		else if (mozillaFix == 1)
+			parent_class->draw_box (style, window, state_type, GTK_SHADOW_NONE, area, widget, detail, x, y, width, height);
 		else
 			drawMenubar(window,style,state_type,x,y,width,height);
 		return;
-- 
cgit v1.2.3