summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-11-16 13:47:48 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-11-24 09:45:25 +0000
commit230283a6433551cb8c575cc30aa956ede8c1146b (patch)
tree53908b4aa341197adbde3b0bb521c33041959719
parent3cf2b5e0e8edc9d6044f8bc29ca9374f75b498a5 (diff)
Related: lp#1580537 tdf#103915 don't set toolbars as primary
because under Ambiance there are dark primary toolbars and light panels and currently we can only render the same icons in the same colors on each. Breeze was explicitly selected as the default icon set to use under unity in commit c0da1080b61a1d51654fc34fdaeba373226065ff Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Sat Feb 27 14:30:01 2016 +0100 lp#1506544 tdf#92458: default to breeze theme on unity desktops Change-Id: I1e0e10d1561e32c5904e0e7352e914bb62b85363 and the downstream workaround of lp#1580537 for this problem is to turn libreoffice toolbars light. glade has toolbar and a panel, both of them are light, so best solution I can see is to remove the primary class from our toolbars. Change-Id: I2f94ff52d56af1806e2b80b97e4ae2c4c82ae57e (cherry picked from commit 739c9780f003bf2628713f04d6e0d20451f14dfb) Reviewed-on: https://gerrit.libreoffice.org/30905 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
-rw-r--r--vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index ca73c1e672c0..f8e093d7bfa1 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2360,7 +2360,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
GtkWidget* pToolbar = gtk_toolbar_new();
mpToolbarStyle = gtk_widget_get_style_context(pToolbar);
- gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_TOOLBAR);
GtkToolItem *item = gtk_separator_tool_item_new();