Merge branch 'dev' into hoverfix

This commit is contained in:
jderose9
2017-01-12 09:26:00 -05:00
2 changed files with 22 additions and 1 deletions

View File

@@ -291,8 +291,27 @@ const dtpPanel = new Lang.Class({
Main.overview._panelGhost.set_height(isTop ? size : 0);
this._myPanelGhost.set_height(isTop ? 0 : size);
isTop ? this.panelBox.set_anchor_point(0, 0) :
if(isTop) {
this.panelBox.set_anchor_point(0, 0);
// styles for theming
if(this.panel.actor.has_style_class_name('dashtopanelBottom'))
this.panel.actor.remove_style_class_name('dashtopanelBottom');
if(!this.panel.actor.has_style_class_name('dashtopanelTop'))
this.panel.actor.add_style_class_name('dashtopanelTop');
} else {
this.panelBox.set_anchor_point(0,(-1)*(Main.layoutManager.primaryMonitor.height-this.panelBox.height));
// styles for theming
if(this.panel.actor.has_style_class_name('dashtopanelTop'))
this.panel.actor.remove_style_class_name('dashtopanelTop');
if(!this.panel.actor.has_style_class_name('dashtopanelBottom'))
this.panel.actor.add_style_class_name('dashtopanelBottom');
}
},
_setActivitiesButtonVisible: function(isVisible) {

View File

@@ -1360,6 +1360,7 @@ const taskbarAppIcon = new Lang.Class({
_onFocusAppChanged: function() {
if(tracker.focus_app == this.app) {
this._dot.opacity = 255;
this.actor.add_style_class_name('focused');
Tweener.addTween(this._dot,
{ width: this._iconContainer.get_width(),
height: RUNNING_INDICATOR_SIZE,
@@ -1373,6 +1374,7 @@ const taskbarAppIcon = new Lang.Class({
});
} else {
this._dot.opacity = 255;
this.actor.remove_style_class_name('focused');
Tweener.addTween(this._dot,
{ width: 0,
height: RUNNING_INDICATOR_SIZE,