panel: Dynamically match corner to style of nearest button
Right now the panel code makes the left corner sync up with the activities button and the right corner sync up with the user menu. This is fine as long as we have an activities button and a user menu. The login screen won't have those things, though. This commit changes the panel corner code to try to figure out which interface element is the most appropriate to sync up with based on its position in the panel. https://bugzilla.gnome.org/show_bug.cgi?id=657082
This commit is contained in:
parent
7f767c49d8
commit
1ecbabc69a
115
js/ui/panel.js
115
js/ui/panel.js
@ -695,13 +695,96 @@ function PanelCorner(panel, side) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
PanelCorner.prototype = {
|
PanelCorner.prototype = {
|
||||||
_init: function(side) {
|
_init: function(box, side) {
|
||||||
this._side = side;
|
this._side = side;
|
||||||
|
|
||||||
|
this._box = box;
|
||||||
|
this._box.connect('style-changed', Lang.bind(this, this._boxStyleChanged));
|
||||||
|
|
||||||
this.actor = new St.DrawingArea({ style_class: 'panel-corner' });
|
this.actor = new St.DrawingArea({ style_class: 'panel-corner' });
|
||||||
this.actor.connect('style-changed', Lang.bind(this, this._styleChanged));
|
this.actor.connect('style-changed', Lang.bind(this, this._styleChanged));
|
||||||
this.actor.connect('repaint', Lang.bind(this, this._repaint));
|
this.actor.connect('repaint', Lang.bind(this, this._repaint));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_findRightmostButton: function(container) {
|
||||||
|
if (!container.get_children)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
let children = container.get_children();
|
||||||
|
|
||||||
|
if (!children || children.length == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Start at the back and work backward
|
||||||
|
let index = children.length - 1;
|
||||||
|
while (!children[index].visible && index >= 0)
|
||||||
|
index--;
|
||||||
|
|
||||||
|
if (index < 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (!(children[index].has_style_class_name('panel-menu')) &&
|
||||||
|
!(children[index].has_style_class_name('panel-button')))
|
||||||
|
return this._findRightmostButton(children[index]);
|
||||||
|
|
||||||
|
return children[index];
|
||||||
|
},
|
||||||
|
|
||||||
|
_findLeftmostButton: function(container) {
|
||||||
|
if (!container.get_children)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
let children = container.get_children();
|
||||||
|
|
||||||
|
if (!children || children.length == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Start at the front and work forward
|
||||||
|
let index = 0;
|
||||||
|
while (!children[index].visible && index < children.length)
|
||||||
|
index++;
|
||||||
|
|
||||||
|
if (index == children.length)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (!(children[index].has_style_class_name('panel-menu')) &&
|
||||||
|
!(children[index].has_style_class_name('panel-button')))
|
||||||
|
return this._findLeftmostButton(children[index]);
|
||||||
|
|
||||||
|
return children[index];
|
||||||
|
},
|
||||||
|
|
||||||
|
_boxStyleChanged: function() {
|
||||||
|
let button;
|
||||||
|
|
||||||
|
if (this._side == St.Side.LEFT)
|
||||||
|
button = this._findLeftmostButton(this._box);
|
||||||
|
else if (this._side == St.Side.RIGHT)
|
||||||
|
button = this._findRightmostButton(this._box);
|
||||||
|
|
||||||
|
if (button) {
|
||||||
|
if (this._button && this._buttonStyleChangedSignalId)
|
||||||
|
this._button.disconnect(this._buttonStyleChangedSignalId);
|
||||||
|
|
||||||
|
this._button = button;
|
||||||
|
|
||||||
|
button.connect('destroy', Lang.bind(this,
|
||||||
|
function() {
|
||||||
|
if (this._button == button) {
|
||||||
|
this._button = null;
|
||||||
|
this._buttonStyleChangedSignalId = 0;
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Synchronize the locate button's pseudo classes with this corner
|
||||||
|
this._buttonStyleChangedSignalId = button.connect('style-changed', Lang.bind(this,
|
||||||
|
function(actor) {
|
||||||
|
let pseudoClass = button.get_style_pseudo_class();
|
||||||
|
this.actor.set_style_pseudo_class(pseudoClass);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
_repaint: function() {
|
_repaint: function() {
|
||||||
let node = this.actor.get_theme_node();
|
let node = this.actor.get_theme_node();
|
||||||
|
|
||||||
@ -802,9 +885,17 @@ Panel.prototype = {
|
|||||||
this._rightBox = new St.BoxLayout({ name: 'panelRight' });
|
this._rightBox = new St.BoxLayout({ name: 'panelRight' });
|
||||||
this.actor.add_actor(this._rightBox);
|
this.actor.add_actor(this._rightBox);
|
||||||
|
|
||||||
this._leftCorner = new PanelCorner(St.Side.LEFT);
|
if (this.actor.get_direction() == St.TextDirection.RTL)
|
||||||
|
this._leftCorner = new PanelCorner(this._rightBox, St.Side.LEFT);
|
||||||
|
else
|
||||||
|
this._leftCorner = new PanelCorner(this._leftBox, St.Side.LEFT);
|
||||||
|
|
||||||
this.actor.add_actor(this._leftCorner.actor);
|
this.actor.add_actor(this._leftCorner.actor);
|
||||||
this._rightCorner = new PanelCorner(St.Side.RIGHT);
|
|
||||||
|
if (this.actor.get_direction() == St.TextDirection.RTL)
|
||||||
|
this._rightCorner = new PanelCorner(this._leftBox, St.Side.RIGHT);
|
||||||
|
else
|
||||||
|
this._rightCorner = new PanelCorner(this._rightBox, St.Side.RIGHT);
|
||||||
this.actor.add_actor(this._rightCorner.actor);
|
this.actor.add_actor(this._rightCorner.actor);
|
||||||
|
|
||||||
this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
|
this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
|
||||||
@ -820,15 +911,6 @@ Panel.prototype = {
|
|||||||
// more cleanly with the rest of the panel
|
// more cleanly with the rest of the panel
|
||||||
this._menus.addMenu(this._activitiesButton.menu);
|
this._menus.addMenu(this._activitiesButton.menu);
|
||||||
|
|
||||||
// Synchronize the button's pseudo classes with its corner
|
|
||||||
this._activities.connect('style-changed', Lang.bind(this,
|
|
||||||
function(actor) {
|
|
||||||
let rtl = actor.get_direction() == St.TextDirection.RTL;
|
|
||||||
let corner = rtl ? this._rightCorner : this._leftCorner;
|
|
||||||
let pseudoClass = actor.get_style_pseudo_class();
|
|
||||||
corner.actor.set_style_pseudo_class(pseudoClass);
|
|
||||||
}));
|
|
||||||
|
|
||||||
this._appMenu = new AppMenuButton();
|
this._appMenu = new AppMenuButton();
|
||||||
this._leftBox.add(this._appMenu.actor);
|
this._leftBox.add(this._appMenu.actor);
|
||||||
|
|
||||||
@ -855,15 +937,6 @@ Panel.prototype = {
|
|||||||
this._userMenu.actor.name = 'panelStatus';
|
this._userMenu.actor.name = 'panelStatus';
|
||||||
this._rightBox.add(this._userMenu.actor);
|
this._rightBox.add(this._userMenu.actor);
|
||||||
|
|
||||||
// Synchronize the buttons pseudo classes with its corner
|
|
||||||
this._userMenu.actor.connect('style-changed', Lang.bind(this,
|
|
||||||
function(actor) {
|
|
||||||
let rtl = actor.get_direction() == St.TextDirection.RTL;
|
|
||||||
let corner = rtl ? this._leftCorner : this._rightCorner;
|
|
||||||
let pseudoClass = actor.get_style_pseudo_class();
|
|
||||||
corner.actor.set_style_pseudo_class(pseudoClass);
|
|
||||||
}));
|
|
||||||
|
|
||||||
Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
|
Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
|
||||||
Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
|
Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user