summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-04-24 11:01:50 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-05-01 12:52:53 +0000
commit2d13cf60ecdab83997c9cd7275c799ddd96617cd (patch)
tree538c29f2bd1ecde9359b12a1b3689d70c7a22b0c
parenttdf#75019 bookmarks in exporting to mediawiki (diff)
downloadcore-libreoffice-4-3.tar.gz
core-libreoffice-4-3.zip
Resolves: tdf#73211 gtk checkboxes need erase afer toggling libreoffice-4-3
because an unchecked checkbox can have a smaller paint area than a checked checkbox. This has always bugged me (cherry picked from commit d194074aa34e3724dd9b93fbc81bf2ba793cd37a) Conflicts: vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx Change-Id: Iac0f075089611b47c381863a9655445d732bfddc Reviewed-on: https://gerrit.libreoffice.org/15510 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx2
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx7
2 files changed, 8 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b1e7e238fcb6..226ea696092e 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -441,6 +441,8 @@ void GtkData::initNWF( void )
pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding;
pSVData->maNWFData.mnMenuFormatBorderY = ythickness + vertical_padding;
+ pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+
if( SalGetDesktopEnvironment() == "KDE" )
{
// #i97196# ensure a widget exists and the style engine was loaded
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 2a1f4e7f4584..ed4c2d03a200 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1470,7 +1470,12 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
return false;
}
-void GtkData::initNWF() {}
+void GtkData::initNWF()
+{
+ ImplSVData* pSVData = ImplGetSVData();
+ pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+}
+
void GtkData::deInitNWF() {}
void GtkSalGraphics::getStyleContext(GtkStyleContext** style, GtkWidget* widget)