brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make workspace selector more similar to the mockup

Browse Source 
This makes the workspace indicator respect the "padding" style attribute.
Also, since we no longer draw the border on top of the thumbnail,
we need to be pixel-precise in allocating the indicator height.

We use this to make the workspace selector more similar to the mockup.

https://bugzilla.gnome.org/show_bug.cgi?id=662087
This commit is contained in:
Stefano Facchini 2011-11-27 00:28:51 +01:00
parent d60a4e97d6
commit 18c62a1987
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/theme/gnome-shell.css
View File

@ -578,22 +578,24 @@ StButton.popup-menu-item:insensitive {
border-right: 0px; border-right: 0px;
border-radius: 9px 0px 0px 9px; border-radius: 9px 0px 0px 9px;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
padding: 8px; padding: 11px 7px 11px 11px;
} }
.workspace-thumbnails-background:rtl { .workspace-thumbnails-background:rtl {
border-right: 1px; border-right: 1px;
border-left: 0px; border-left: 0px;
border-radius: 0px 9px 9px 0px; border-radius: 0px 9px 9px 0px;
padding: 11px 11px 11px 7px;
} }
.workspace-thumbnails { .workspace-thumbnails {
spacing: 7px; spacing: 11px;
} }
.workspace-thumbnail-indicator { .workspace-thumbnail-indicator {
outline: 2px solid white; border: 4px solid rgba(255,255,255,0.7);
border: 1px solid #888; border-radius: 4px;
padding: 1px;
} }
.window-caption { .window-caption {

25
js/ui/workspaceThumbnail.js
View File

@ -1045,9 +1045,16 @@ const ThumbnailsBox = new Lang.Class({
childBox.y2 = box.y2; childBox.y2 = box.y2;
this._background.allocate(childBox, flags); this._background.allocate(childBox, flags);
let indicatorY = this._indicatorY; let indicatorY1 = this._indicatorY;
let indicatorY2;
// when not animating, the workspace position overrides this._indicatorY // when not animating, the workspace position overrides this._indicatorY
let indicatorWorkspace = !this._animatingIndicator ? global.screen.get_active_workspace() : null; let indicatorWorkspace = !this._animatingIndicator ? global.screen.get_active_workspace() : null;
let indicatorThemeNode = this._indicator.get_theme_node();
let indicatorTopFullBorder = indicatorThemeNode.get_padding(St.Side.TOP) + indicatorThemeNode.get_border_width(St.Side.TOP);
let indicatorBottomFullBorder = indicatorThemeNode.get_padding(St.Side.BOTTOM) + indicatorThemeNode.get_border_width(St.Side.BOTTOM);
let indicatorLeftFullBorder = indicatorThemeNode.get_padding(St.Side.LEFT) + indicatorThemeNode.get_border_width(St.Side.LEFT);
let indicatorRightFullBorder = indicatorThemeNode.get_padding(St.Side.RIGHT) + indicatorThemeNode.get_border_width(St.Side.RIGHT);
let y = contentBox.y1; let y = contentBox.y1;
@ -1093,8 +1100,10 @@ const ThumbnailsBox = new Lang.Class({
let y2 = Math.round(y + thumbnailHeight); let y2 = Math.round(y + thumbnailHeight);
let roundedVScale = (y2 - y1) / portholeHeight; let roundedVScale = (y2 - y1) / portholeHeight;
if (thumbnail.metaWorkspace == indicatorWorkspace) if (thumbnail.metaWorkspace == indicatorWorkspace) {
indicatorY = y1; indicatorY1 = y1;
indicatorY2 = y2;
}
// Allocating a scaled actor is funny - x1/y1 correspond to the origin // Allocating a scaled actor is funny - x1/y1 correspond to the origin
// of the actor, but x2/y2 are increased by the *unscaled* size. // of the actor, but x2/y2 are increased by the *unscaled* size.
@ -1119,8 +1128,10 @@ const ThumbnailsBox = new Lang.Class({
childBox.x1 = contentBox.x2 - thumbnailWidth; childBox.x1 = contentBox.x2 - thumbnailWidth;
childBox.x2 = contentBox.x2; childBox.x2 = contentBox.x2;
} }
childBox.y1 = indicatorY; childBox.x1 -= indicatorLeftFullBorder;
childBox.y2 = childBox.y1 + thumbnailHeight; childBox.x2 += indicatorRightFullBorder;
childBox.y1 = indicatorY1 - indicatorTopFullBorder;
childBox.y2 = (indicatorY2 ? indicatorY2 : (indicatorY1 + thumbnailHeight)) + indicatorBottomFullBorder;
this._indicator.allocate(childBox, flags); this._indicator.allocate(childBox, flags);
}, },
@ -1135,7 +1146,9 @@ const ThumbnailsBox = new Lang.Class({
} }
this._animatingIndicator = true; this._animatingIndicator = true;
this.indicatorY = this._indicator.allocation.y1; let indicatorThemeNode = this._indicator.get_theme_node();
let indicatorTopFullBorder = indicatorThemeNode.get_padding(St.Side.TOP) + indicatorThemeNode.get_border_width(St.Side.TOP);
this.indicatorY = this._indicator.allocation.y1 + indicatorTopFullBorder;
Tweener.addTween(this, Tweener.addTween(this,
{ indicatorY: thumbnail.actor.allocation.y1, { indicatorY: thumbnail.actor.allocation.y1,
time: WorkspacesView.WORKSPACE_SWITCH_TIME, time: WorkspacesView.WORKSPACE_SWITCH_TIME,