Merge lp:~donadigo/wingpanel/fix-indicator-expanding into lp:~wingpanel-devs/wingpanel/trunk

Proposed by Adam Bieńkowski
Status: Merged
Approved by: Danielle Foré
Approved revision: 120
Merged at revision: 118
Proposed branch: lp:~donadigo/wingpanel/fix-indicator-expanding
Merge into: lp:~wingpanel-devs/wingpanel/trunk
Diff against target: 27 lines (+5/-1)
2 files modified
src/PanelWindow.vala (+1/-1)
src/Services/PopoverManager.vala (+4/-0)
To merge this branch: bzr merge lp:~donadigo/wingpanel/fix-indicator-expanding
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+291438@code.launchpad.net

Commit message

* Fix indicator expanding to the side instead of to the bottom.

Description of the change

The branch fixes the problem where indicators can sometimes reveal to the side instead to the bottom. The way this works now that every panel dimensions update checks if there is opened any indicator, if yes then set size request to full monitor height, if not set it back to it's normal size.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PanelWindow.vala'
2--- src/PanelWindow.vala 2016-04-03 15:36:24 +0000
3+++ src/PanelWindow.vala 2016-04-09 18:51:05 +0000
4@@ -100,7 +100,7 @@
5 monitor_width = monitor_dimensions.width;
6 monitor_height = monitor_dimensions.height;
7
8- this.set_size_request (monitor_width, -1);
9+ this.set_size_request (monitor_width, (popover_manager.get_visible_popover () != null) ? monitor_height : -1);
10
11 monitor_x = monitor_dimensions.x;
12 monitor_y = monitor_dimensions.y;
13
14=== modified file 'src/Services/PopoverManager.vala'
15--- src/Services/PopoverManager.vala 2016-01-16 00:43:14 +0000
16+++ src/Services/PopoverManager.vala 2016-04-09 18:51:05 +0000
17@@ -64,6 +64,10 @@
18 owner.add_events (Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.BUTTON_PRESS_MASK);
19 }
20
21+ public unowned Gtk.Popover? get_visible_popover () {
22+ return visible_popover;
23+ }
24+
25 public void set_popover_visible (string code_name, bool visible) {
26 popovers.@foreach ((popover, indicator_entry) => {
27 if (indicator_entry.base_indicator.code_name == code_name) {

Subscribers

People subscribed via source and target branches