diff options
| author |   Eric Hameleers <alien@slackware.com> | 2011-11-24 20:16:14 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2011-11-24 20:16:14 +0000 |
| commit | 29259a1c6c3bbd408f4a373f4a2a76e12ab4c0cf (patch) | |
| tree | 7c6b16780811cc5765c4932e133867a11aa48070 /libreoffice | |
| parent | fee065f39c6b756712cd770719c919d6452049c8 (diff) | |
| download | asb-29259a1c6c3bbd408f4a373f4a2a76e12ab4c0cf.tar.gz asb-29259a1c6c3bbd408f4a373f4a2a76e12ab4c0cf.tar.xz | |
Initial revision
Diffstat (limited to 'libreoffice')
| -rw-r--r-- | libreoffice/build/patches/libreoffice.kdetooltips.diff | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/libreoffice/build/patches/libreoffice.kdetooltips.diff b/libreoffice/build/patches/libreoffice.kdetooltips.diff new file mode 100644 index 00000000..e86fe276 --- /dev/null +++ b/libreoffice/build/patches/libreoffice.kdetooltips.diff @@ -0,0 +1,59 @@ +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 ); + + |