diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-05-11 19:44:46 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-05-11 19:44:46 +0000 |
commit | 08f384fd06a468247b6a87830595465b915a32e5 (patch) | |
tree | 6dbe239b26f5c9a865646ddfb8d592fde958c99c /www/waterfox/files/patch-bug1314928 | |
parent | New port: security/py-winrm (diff) |
www/waterfox: update to 56.1.0.89
Changes: https://github.com/MrAlex94/Waterfox/compare/56.1.0...2bb1a86e5dbd6
Diffstat (limited to 'www/waterfox/files/patch-bug1314928')
-rw-r--r-- | www/waterfox/files/patch-bug1314928 | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/www/waterfox/files/patch-bug1314928 b/www/waterfox/files/patch-bug1314928 deleted file mode 100644 index 22309cf26ea7..000000000000 --- a/www/waterfox/files/patch-bug1314928 +++ /dev/null @@ -1,64 +0,0 @@ -commit 4cb65b680138 -Author: Martin Stransky <stransky@redhat.com> -Date: Fri Aug 25 10:30:28 2017 +0200 - - Bug 1314928 - get link text color by GTK_STATE_FLAG_LINK on Gtk3 >= 3.12, r=karlt - - MozReview-Commit-ID: BPR2AgoUx5H - - --HG-- - extra : rebase_source : c4670cd6b7df84dd00a4d04c3bfc582f917795da ---- - widget/gtk/nsLookAndFeel.cpp | 32 ++++++++++++++++++++++++-------- - 1 file changed, 24 insertions(+), 8 deletions(-) - -diff --git widget/gtk/nsLookAndFeel.cpp widget/gtk/nsLookAndFeel.cpp -index 7cd8e8dcc163..6bb3e27c6653 100644 ---- widget/gtk/nsLookAndFeel.cpp -+++ widget/gtk/nsLookAndFeel.cpp -@@ -43,6 +43,10 @@ using mozilla::LookAndFeel; - ((nscolor) NS_RGBA((int)((c).red*255), (int)((c).green*255), \ - (int)((c).blue*255), (int)((c).alpha*255))) - -+#if !GTK_CHECK_VERSION(3,12,0) -+#define GTK_STATE_FLAG_LINK (static_cast<GtkStateFlags>(1 << 9)) -+#endif -+ - nsLookAndFeel::nsLookAndFeel() - : nsXPLookAndFeel(), - #if (MOZ_WIDGET_GTK == 2) -@@ -1457,14 +1461,26 @@ nsLookAndFeel::EnsureInit() - } - sMenuSupportsDrag = supports_menubar_drag; - -- colorValuePtr = nullptr; -- gtk_widget_style_get(linkButton, "link-color", &colorValuePtr, nullptr); -- if (colorValuePtr) { -- colorValue = *colorValuePtr; // we can't pass deref pointers to GDK_COLOR_TO_NS_RGB -- sNativeHyperLinkText = GDK_COLOR_TO_NS_RGB(colorValue); -- gdk_color_free(colorValuePtr); -- } else { -- sNativeHyperLinkText = NS_RGB(0x00,0x00,0xEE); -+#if (MOZ_WIDGET_GTK == 3) -+ if (gtk_check_version(3, 12, 0) == nullptr) { -+ // TODO: It returns wrong color for themes which -+ // sets link color for GtkLabel only as we query -+ // GtkLinkButton style here. -+ style = gtk_widget_get_style_context(linkButton); -+ gtk_style_context_get_color(style, GTK_STATE_FLAG_LINK, &color); -+ sNativeHyperLinkText = GDK_RGBA_TO_NS_RGBA(color); -+ } else -+#endif -+ { -+ colorValuePtr = nullptr; -+ gtk_widget_style_get(linkButton, "link-color", &colorValuePtr, nullptr); -+ if (colorValuePtr) { -+ colorValue = *colorValuePtr; // we can't pass deref pointers to GDK_COLOR_TO_NS_RGB -+ sNativeHyperLinkText = GDK_COLOR_TO_NS_RGB(colorValue); -+ gdk_color_free(colorValuePtr); -+ } else { -+ sNativeHyperLinkText = NS_RGB(0x00,0x00,0xEE); -+ } - } - - // invisible character styles |