diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog 2018-10-07 21:39:11.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/changelog 2019-01-13 19:23:14.000000000 +0000 @@ -1,3 +1,16 @@ +budgie-desktop (10.4+git20180830.02.f2dbc215fdb-2.1) cosmic; urgency=medium + + * cherrypick upstream commits (LP: #1811620) + - fix_panel_autohide.patch + Enable autohiding when using multiple budgie panels + - deduplicate-menuall.patch + deduplicate All category Menu + - 0012-Force-raven-widget-show-hide-to-display-contents-cor.patch + Ensure Raven controls can be correctly hidden if configured on + a relogon + + -- David Mohammed Sun, 13 Jan 2019 19:23:14 +0000 + budgie-desktop (10.4+git20180830.02.f2dbc215fdb-2) unstable; urgency=medium * Bug-fix release diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0012-Force-raven-widget-show-hide-to-display-contents-cor.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0012-Force-raven-widget-show-hide-to-display-contents-cor.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0012-Force-raven-widget-show-hide-to-display-contents-cor.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/0012-Force-raven-widget-show-hide-to-display-contents-cor.patch 2019-01-13 19:23:14.000000000 +0000 @@ -0,0 +1,25 @@ +Description: [PATCH] Force raven widget show/hide to display contents correctly + (#1596) +Origin: Commit f342f930b5c68ee2097bb58df143588a7b01ccd5 +Author: David Mohammed +Last-Update: 2018-11-23 + +--- + src/raven/main_view.vala | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: budgie-desktop-10.4+git20180830.02.f2dbc215fdb/src/raven/main_view.vala +=================================================================== +--- budgie-desktop-10.4+git20180830.02.f2dbc215fdb.orig/src/raven/main_view.vala ++++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/src/raven/main_view.vala +@@ -137,6 +137,10 @@ public class MainView : Gtk.Box + + public void set_clean() + { ++ on_raven_settings_changed("show-calendar-widget"); ++ on_raven_settings_changed("show-sound-output-widget"); ++ on_raven_settings_changed("show-mic-input-widget"); ++ on_raven_settings_changed("show-mpris-widget"); + main_stack.set_visible_child_name("applets"); + } + } diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/deduplicate-menuall.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/deduplicate-menuall.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/deduplicate-menuall.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/deduplicate-menuall.patch 2019-01-13 19:23:14.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Deduplicate Menu All patch + This commit has been rebased on the 10.4 bionic code base. +Author: Budgie Desktop Developers +Origin: Commit 3f693c254117b1a64ea65ffa22e881d0b7a03828 +Last-Update: 2018-12-20 +--- + src/session/meson.build | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +Index: budgie-desktop-10.4+git20171031.10.g9f71bb8/src/applets/budgie-menu/BudgieMenuWindow.vala +=================================================================== +--- budgie-desktop-10.4+git20171031.10.g9f71bb8.orig/src/applets/budgie-menu/BudgieMenuWindow.vala ++++ budgie-desktop-10.4+git20171031.10.g9f71bb8/src/applets/budgie-menu/BudgieMenuWindow.vala +@@ -418,6 +418,7 @@ public class BudgieMenuWindow : Budgie.P + categories_scroll.set_visible(vis); + compact_mode = vis; + content.invalidate_headers(); ++ content.invalidate_filter(); + content.invalidate_sort(); + break; + case "menu-headers": +@@ -429,6 +430,7 @@ public class BudgieMenuWindow : Budgie.P + content.set_header_func(null); + } + content.invalidate_headers(); ++ content.invalidate_filter(); + content.invalidate_sort(); + break; + case "menu-categories-hover": +@@ -594,11 +596,11 @@ public class BudgieMenuWindow : Budgie.P + + // No more filtering, show all + if (group == null) { +- // Don't dupe when in "super compact" mode +- if (super_compact && this.is_item_dupe(child)) { +- return false; ++ if (this.headers_visible) { // If we are going to be showing headers ++ return true; ++ } else { // Not showing headers ++ return !this.is_item_dupe(child); + } +- return true; + } + + // If the GMenu.TreeDirectory isn't the same as the current filter, hide it diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/fix_panel_autohide.patch budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/fix_panel_autohide.patch --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/fix_panel_autohide.patch 1970-01-01 01:00:00.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/fix_panel_autohide.patch 2019-01-13 19:23:14.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Resolve autohide with multiple docks + When intellihide/autohide is used with multiple panels, some panels + never appear when the mouse cursor is moved to the panel location. + This patch has been created from the upstream commit rebased + with the 18.04 code baseline +Origin: Commit e3f941105e7684e599415a22752b6d00ec524450 +Author: David Mohammed +Last-Update: 2019-01-12 + +Index: budgie-desktop-10.4+git20171031.10.g9f71bb8/src/panel/manager.vala +=================================================================== +--- budgie-desktop-10.4+git20171031.10.g9f71bb8.orig/src/panel/manager.vala ++++ budgie-desktop-10.4+git20171031.10.g9f71bb8/src/panel/manager.vala +@@ -314,7 +314,7 @@ public class PanelManager : DesktopManag + Gdk.Rectangle win = Gdk.Rectangle(); + Gdk.Rectangle pan = Gdk.Rectangle(); + +- if (window == null) { ++ if (window == null && this.window_list.length() == 0) { + return false; + } + diff -Nru budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series --- budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series 2018-10-07 21:39:11.000000000 +0100 +++ budgie-desktop-10.4+git20180830.02.f2dbc215fdb/debian/patches/series 2019-01-13 19:23:14.000000000 +0000 @@ -9,4 +9,7 @@ 0009-Add-null-guards.patch 0010-Ensure-focus-and-button-layout-keys-are-updated.patch 0011-Override-new-mutter-vertical-workspace-layout.patch +0012-Force-raven-widget-show-hide-to-display-contents-cor.patch 1000-Obtain-gsettings-transparency-key-value-before-showi.patch +deduplicate-menuall.patch +fix_panel_autohide.patch