Update gala background manager removal patches

3 files changed, 16 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a282e0dc6c8b..7e4a2c136454 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 = r580.4c359a3
+	pkgver = r595.52c921b
 	pkgrel = 1
 	url = https://github.com/elementary/wingpanel
 	arch = i686
@@ -49,7 +49,7 @@ pkgbase = wingpanel-standalone-git
 	source = fix-for-openbox.patch
 	source = no-mutter-typelib.patch
 	sha256sums = SKIP
-	sha256sums = 96076d8eab47bf9fe4bfaea58e79c98550c4f8e595a26fe052e59d755ae884b8
+	sha256sums = 916d436b283b73fc006689efee9de809107fc9f405bd0d6c46049e4144defaab
 	sha256sums = aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c
 	sha256sums = cbea39c2f11ecaf8f6d86f79253746575da479bdd25a166a36ee82f09f9135a0
 	sha256sums = aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45
diff --git a/PKGBUILD b/PKGBUILD
index ae06a5ec8d0b..6345888de951 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-standalone-git
-pkgver=r580.4c359a3
+pkgver=r595.52c921b
 pkgrel=1
 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
 arch=('i686' 'x86_64')
@@ -27,7 +27,7 @@ source=('git+https://github.com/elementary/wingpanel.git'
         'fix-for-openbox.patch'
         'no-mutter-typelib.patch')
 sha256sums=('SKIP'
-            '96076d8eab47bf9fe4bfaea58e79c98550c4f8e595a26fe052e59d755ae884b8'
+            '916d436b283b73fc006689efee9de809107fc9f405bd0d6c46049e4144defaab'
             'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c'
             'cbea39c2f11ecaf8f6d86f79253746575da479bdd25a166a36ee82f09f9135a0'
             'aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45'
diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch
index 6a124eaa5bc5..f1b0dec3b90f 100644
--- a/minus-backgroundmanager.patch
+++ b/minus-backgroundmanager.patch
@@ -29,39 +29,24 @@
 @@ -25,7 +25,6 @@
      private MenuBar center_menubar;
  
-     private Gtk.StyleContext style_context;
+     private unowned Gtk.StyleContext style_context;
 -    private Gtk.CssProvider? style_provider = null;
  
-     public Panel (Services.PopoverManager popover_manager) {
-         Object (popover_manager : popover_manager);
-@@ -64,60 +63,26 @@
-         });
- 
-         style_context = this.get_style_context ();
+     private int _draw_y = 0;
+     public int draw_y {
+@@ -64,8 +63,6 @@
+         style_context = get_style_context ();
+         style_context.add_class (StyleClass.PANEL);
          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;
+@@ -111,38 +108,6 @@
          });
      }
  
-     public override bool draw (Cairo.Context ctx) {
-         ctx.translate (0, draw_y);
-         return base.draw (ctx);
-     }
- 
-     static construct {
-         resource_provider = new Gtk.CssProvider ();
-         resource_provider.load_from_resource ("io/elementary/wingpanel/panel.css");
--    }
--
 -    public override bool button_press_event (Gdk.EventButton event) {
 -        if (event.button != Gdk.BUTTON_PRIMARY) {
 -            return Gdk.EVENT_PROPAGATE;
@@ -92,9 +77,11 @@
 -
 -        var background_manager = Services.BackgroundManager.get_default ();
 -        return background_manager.begin_grab_focused_window (x, y, (int)event.button, time, state);
-     }
- 
+-    }
+-
      public void cycle (bool forward) {
+         var current = popover_manager.current_indicator;
+         if (current == null) {
 @@ -263,56 +229,4 @@
              }
          }
@@ -157,7 +144,7 @@
 @@ -1,7 +1,6 @@
      'PanelWindow.vala',
      'SessionManager.vala',
-     'Wingpanel.vala',
+     'Application.vala',
 -    'Services/BackgroundManager.vala',
      'Services/IndicatorSorter.vala',
      'Services/PopoverManager.vala',