[arch-commits] Commit in electron/trunk (PKGBUILD gtk3-menu-bar.patch)

[Nicola Squartini]

    Date: Sunday, September 11, 2016 @ 09:00:39
  Author: tensor5
Revision: 189169

upgpkg: electron 1.3.5-3

Pick menu bar text color from GtkLabel.

Modified:
  electron/trunk/PKGBUILD
  electron/trunk/gtk3-menu-bar.patch

---------------------+
 PKGBUILD            |    4 ++--
 gtk3-menu-bar.patch |   19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-11 07:02:05 UTC (rev 189168)
+++ PKGBUILD	2016-09-11 09:00:39 UTC (rev 189169)
@@ -4,7 +4,7 @@
 _chromiumver=52.0.2743.82
 pkgname=electron
 pkgver=1.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('i686' 'x86_64')
 url='http://electron.atom.io/'
@@ -66,7 +66,7 @@
             '7fd0fc72a14b2a08ce0f258a750a9d181386b9277312f2ed5446c29b8ec4e282'
             '75b2e9827f0593e59a35c36c6039ad10d35d7499fed6d97c4ed48ef1cce54c2b'
             'c209475c16b506d8d888a54c8564718cf9775f450d1867e19e86a03d99a119be'
-            '4834c8573587c133d02a21cdfeffd9ef3ad7d71360ba548f33e100448e2cb821'
+            '3f9bc0e3ee316f172b390584287fb93778ad8923f99f8e80ead8cfd5fa23127a'
             '00506737d1005f76caa8d5505acd4c1d19b42ca62e9f07a26664659447413694'
             'e56184ddcceb29cfb1fcbca52678f72b7b8f8c8e69791016062f381aa78182f2'
             'eb8f4d2b376dce69bec4741301696e9a9b7796fcdb00e80281438d84dc4d8659'

Modified: gtk3-menu-bar.patch
===================================================================
--- gtk3-menu-bar.patch	2016-09-11 07:02:05 UTC (rev 189168)
+++ gtk3-menu-bar.patch	2016-09-11 09:00:39 UTC (rev 189169)
@@ -9,7 +9,7 @@
  #endif
  
  namespace atom {
-@@ -30,18 +28,68 @@ const char kViewClassName[] = "ElectronMenuBar";
+@@ -30,18 +28,71 @@ const char kViewClassName[] = "ElectronMenuBar";
  const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
  
  #if defined(USE_X11)
@@ -32,12 +32,14 @@
 -  *hover = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
 -  *background = libgtk2ui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
 -
-+  GtkWidget* menu_item = gtk_menu_item_new();
++  GtkWidget* menu_item = gtk_menu_item_new_with_label("");
++  GtkWidget* label = gtk_bin_get_child(GTK_BIN(menu_item));
 +  GtkStyleContext* window_style_ctx = gtk_widget_get_style_context(window);
 +  GtkStyleContext* menu_bar_style_ctx =
 +    gtk_widget_get_style_context(menu_bar);
 +  GtkStyleContext* menu_item_style_ctx =
 +    gtk_widget_get_style_context(menu_item);
++  GtkStyleContext* label_style_ctx = gtk_widget_get_style_context(label);
 +  GdkRGBA normal_color;
 +  GdkRGBA backdrop_color;
 +  GdkRGBA prelight_color;
@@ -62,21 +64,22 @@
 +  *background = GdkRGBAToSkColor(*background_color_ptr);
 +  gdk_rgba_free(background_color_ptr);
 +
-+  gtk_style_context_get_color(menu_item_style_ctx,
++  gtk_style_context_get_color(label_style_ctx,
 +                              GTK_STATE_FLAG_NORMAL,
 +                              &normal_color);
 +  *enabled = GdkRGBAToSkColor(normal_color);
 +  *hover = GdkRGBAToSkColor(normal_color);
 +
-+  gtk_style_context_get_color(menu_item_style_ctx,
-+                              GTK_STATE_FLAG_PRELIGHT,
++  gtk_style_context_set_state(menu_item_style_ctx, GTK_STATE_FLAG_PRELIGHT);
++  gtk_style_context_get_color(label_style_ctx,
++                              GTK_STATE_FLAG_NORMAL,
 +                              &prelight_color);
++  gtk_style_context_set_state(menu_item_style_ctx, GTK_STATE_FLAG_NORMAL);
 +  *highlight = GdkRGBAToSkColor(prelight_color);
 +
 +
-+  gtk_style_context_set_state(window_style_ctx, GTK_STATE_FLAG_BACKDROP);
-+  gtk_style_context_get_color(menu_item_style_ctx,
-+                              GTK_STATE_FLAG_NORMAL,
++  gtk_style_context_get_color(label_style_ctx,
++                              GTK_STATE_FLAG_BACKDROP,
 +                              &backdrop_color);
 +  *disabled = GdkRGBAToSkColor(backdrop_color);
 +