601058e269
- correctly-init-xthreads-in-qt.diff: let Qt call XInitThreads(), so that it knows it's been called (fdo#40298) - avoid-wrong-asserts.diff: fix a bad assert; the following fix depends on it - horizontal-scrollbars-with-kde-oxygen-style.diff: horizontal scrollbars with KDE Oxygen style (bnc#722918) - kde4-tooltips-style.diff: tooltips are all black in KDE4 (bnc#723074, fdo#40461) - do-not-display-math-in-desktop-menu.diff: do not display math in desktop menu (fdo#41681) - desktop-submenu.diff: display LO application in the right desktop submenu (bnc#718694) - bash-completion-for-loffice.diff: define bash completion for 'loffice' wrapper (bnc#719656) - legacy-fragment-import-*.diff: legacy fragment PPTX import (bnc#699334) OBS-URL: https://build.opensuse.org/request/show/89119 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=25
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
commit c2f539bcd920de8d2fa2983e700895a7ea308c9b
|
|
Author: Luboš Luňák <l.lunak@suse.cz>
|
|
Date: Tue Oct 18 17:37:22 2011 +0200
|
|
|
|
style tooltips properly with KDE4 vclplug (fdo#40461)
|
|
|
|
ACK by Kendy.
|
|
|
|
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
|
|
index ab6bf1a..f9ae9f3 100644
|
|
--- a/vcl/unx/kde4/KDESalFrame.cxx
|
|
+++ b/vcl/unx/kde4/KDESalFrame.cxx
|
|
@@ -38,6 +38,8 @@
|
|
#include <kmainwindow.h>
|
|
#include <kapplication.h>
|
|
#include <ktoolbar.h>
|
|
+#include <qdebug.h>
|
|
+#include <qtooltip.h>
|
|
|
|
#undef Region
|
|
|
|
@@ -240,11 +242,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
|
|
style.SetFieldTextColor( aText );
|
|
style.SetFieldRolloverTextColor( aText );
|
|
style.SetWindowTextColor( aText );
|
|
- style.SetHelpTextColor( aText );
|
|
|
|
// Base
|
|
style.SetFieldColor( aBase );
|
|
- style.SetHelpColor( aBase );
|
|
style.SetWindowColor( aBase );
|
|
style.SetActiveTabColor( aBase );
|
|
|
|
@@ -280,11 +280,14 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
|
|
style.SetHighlightColor( aHigh );
|
|
style.SetHighlightTextColor( toColor(pal.color( QPalette::HighlightedText)) );
|
|
|
|
+ // Tooltip
|
|
+ style.SetHelpColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipBase )));
|
|
+ style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText )));
|
|
+
|
|
// Font
|
|
Font aFont = toFont( kapp->font(), rSettings.GetUILocale() );
|
|
|
|
style.SetAppFont( aFont );
|
|
- style.SetHelpFont( aFont );
|
|
|
|
style.SetMenuFont( aFont ); // will be changed according to pMenuBar
|
|
//style.SetToolFont( aFont ); //already set above
|
|
@@ -303,6 +306,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
|
|
}
|
|
style.SetFloatTitleFont( aFont );
|
|
|
|
+ style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale()));
|
|
+
|
|
int flash_time = QApplication::cursorFlashTime();
|
|
style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
|
|
|