Update minus-backgroundmanager.patch, include (temporary) patch to fix strut behavior in openbox, actually remove reverse-105c1d0.patch

5 files changed, 51 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14772b7b13d8..a282e0dc6c8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wingpanel-standalone-git
 	pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
-	pkgver = r563.88305e0
+	pkgver = r580.4c359a3
 	pkgrel = 1
 	url = https://github.com/elementary/wingpanel
 	arch = i686
@@ -11,6 +11,7 @@ pkgbase = wingpanel-standalone-git
 	makedepends = libgranite.so
 	makedepends = git
 	makedepends = vala
+	makedepends = nano
 	depends = libgee
 	depends = libwnck3
 	depends = cogl
@@ -45,13 +46,13 @@ pkgbase = wingpanel-standalone-git
 	source = minus-backgroundmanager.patch
 	source = minus-galaplugin.patch
 	source = autohide.patch
-	source = reverse-105c1d0.patch
+	source = fix-for-openbox.patch
 	source = no-mutter-typelib.patch
 	sha256sums = SKIP
-	sha256sums = 69d564a34766b2bc16f9756b5915223da33cfd66c46b206aa6c4342f94404ba9
+	sha256sums = 96076d8eab47bf9fe4bfaea58e79c98550c4f8e595a26fe052e59d755ae884b8
 	sha256sums = aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c
 	sha256sums = cbea39c2f11ecaf8f6d86f79253746575da479bdd25a166a36ee82f09f9135a0
-	sha256sums = 53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394
+	sha256sums = aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45
 	sha256sums = 5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7
 
 pkgname = wingpanel-standalone-git
diff --git a/PKGBUILD b/PKGBUILD
index cf4a6a46e089..ae06a5ec8d0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-standalone-git
-pkgver=r563.88305e0
+pkgver=r580.4c359a3
 pkgrel=1
 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url='https://github.com/elementary/wingpanel'
 license=('GPL3')
 groups=('pantheon-qq')
 depends=(lib{gee,wnck3} 'cogl')
-makedepends=('meson' 'libgranite.so' 'git' 'vala')
+makedepends=('meson' 'libgranite.so' 'git' 'vala' 'nano')
 optdepends=("pantheon-applications-menu-git: Application launcher"
             wingpanel-indicator-{a11y,bluetooth,datetime,keyboard,network,notifications,power,session,sensors,sound}-git": Tray applet"
             wingpanel-indicator-{ayatana,namarupa}-git": Display Unity 7 tray applets"
@@ -24,13 +24,13 @@ source=('git+https://github.com/elementary/wingpanel.git'
         'minus-backgroundmanager.patch'
         'minus-galaplugin.patch'
         'autohide.patch'
-        'reverse-105c1d0.patch'
+        'fix-for-openbox.patch'
         'no-mutter-typelib.patch')
 sha256sums=('SKIP'
-            '69d564a34766b2bc16f9756b5915223da33cfd66c46b206aa6c4342f94404ba9'
+            '96076d8eab47bf9fe4bfaea58e79c98550c4f8e595a26fe052e59d755ae884b8'
             'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c'
             'cbea39c2f11ecaf8f6d86f79253746575da479bdd25a166a36ee82f09f9135a0'
-            '53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394'
+            'aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45'
             '5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7')
 
 pkgver() {
@@ -47,9 +47,9 @@ prepare() {
   patch -Np1 < ../autohide.patch
   #patch -Np2 < ../autohide-testing.patch
 
-  #Reverse 105c1d0 (restores Ayatana indicator submenus)
-  #msg2 "Reverse commit 105c1d0"
-  #patch -Np1 < ../reverse-105c1d0.patch
+  #Fixes
+  msg2 "Fix multiple-monitor strut method for openbox"
+  patch -Np1 < ../fix-for-openbox.patch
 
   #Standalone patches
   msg2 "Remove Gala dependecies"
diff --git a/fix-for-openbox.patch b/fix-for-openbox.patch
new file mode 100644
index 000000000000..01af1c910bc3
--- /dev/null
+++ b/fix-for-openbox.patch
@@ -0,0 +1,28 @@
+diff --git a/src/PanelWindow.vala b/src/PanelWindow.vala
+index 9c24feb..c97ece3 100644
+--- a/src/PanelWindow.vala
++++ b/src/PanelWindow.vala
+@@ -169,7 +169,11 @@ public class Wingpanel.PanelWindow : Gtk.Window {
+ 
+         long struts[12] = { 0 };
+         var scale_factor = this.get_scale_factor ();
+-        if (no_monitor_left) {
++        if (no_monitor_above) {
++            struts [2] = (monitor_y - panel_displacement) * scale_factor;
++            struts [8] = monitor_x * scale_factor;
++            struts [9] = (monitor_x + monitor_width) * scale_factor - 1;
++        } else if (no_monitor_left) {
+             struts [0] = (monitor_x + monitor_width) * scale_factor;
+             struts [4] = monitor_y * scale_factor;
+             struts [5] = (monitor_y - panel_displacement) * scale_factor - 1;
+@@ -177,10 +181,6 @@ public class Wingpanel.PanelWindow : Gtk.Window {
+             struts [1] = (screen_width - monitor_x) * scale_factor;
+             struts [6] = monitor_y * scale_factor;
+             struts [7] = (monitor_y - panel_displacement) * scale_factor - 1;
+-        } else if (no_monitor_above) {
+-            struts [2] = (monitor_y - panel_displacement) * scale_factor;
+-            struts [8] = monitor_x * scale_factor;
+-            struts [9] = (monitor_x + monitor_width) * scale_factor - 1;
+         } else {
+             warning ("Unable to set struts, because Wingpanel is not at the edge of the Gdk.Screen area.");
+         }
diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch
index b61f45bd6c48..6a124eaa5bc5 100644
--- a/minus-backgroundmanager.patch
+++ b/minus-backgroundmanager.patch
@@ -34,13 +34,22 @@
  
      public Panel (Services.PopoverManager popover_manager) {
          Object (popover_manager : popover_manager);
-@@ -64,51 +63,17 @@
+@@ -64,60 +63,26 @@
          });
  
          style_context = this.get_style_context ();
          style_context.add_provider (resource_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 -
 -        Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
+ 
+         var granite_settings = Granite.Settings.get_default ();
+         var gtk_settings = Gtk.Settings.get_default ();
+ 
+         gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
+ 
+         granite_settings.notify["prefers-color-scheme"].connect (() => {
+             gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
+         });
      }
  
      public override bool draw (Cairo.Context ctx) {
diff --git a/reverse-105c1d0.patch b/reverse-105c1d0.patch
deleted file mode 100644
index 85f52a71a030..000000000000
--- a/reverse-105c1d0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/Widgets/IndicatorEntry.vala b/src/Widgets/IndicatorEntry.vala
-index 2ad9776..f68051d 100644
---- a/src/Widgets/IndicatorEntry.vala
-+++ b/src/Widgets/IndicatorEntry.vala
-@@ -59,6 +59,18 @@ public class Wingpanel.Widgets.IndicatorEntry : Gtk.MenuItem {
-         this.add (revealer);
-         revealer.add (display_widget);
- 
-+        if (indicator_widget == null) {
-+            this.button_press_event.connect ((e) => {
-+                popover_manager.close ();
-+                display_widget.button_press_event (e);
-+
-+                return Gdk.EVENT_PROPAGATE;
-+            });
-+            set_reveal (base_indicator.visible);
-+
-+            return;
-+        }
-+
-         if (base_indicator.visible) {
-             popover_manager.register_indicator (this);
-         }