[gnome-shell] OverviewControl: simplify code to add bottom padding
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] OverviewControl: simplify code to add bottom padding
- Date: Mon, 18 Feb 2013 16:38:07 +0000 (UTC)
commit a187111a261e305525b5a855ecdc7a8b7f89c529
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Mon Feb 18 16:25:28 2013 +0100
OverviewControl: simplify code to add bottom padding
All the complexity with a custom actor and a generic container was
just to add some padding below the overview controls. Remove that,
and use CSS instead.
https://bugzilla.gnome.org/show_bug.cgi?id=694100
data/theme/gnome-shell.css | 1 +
js/ui/overview.js | 3 +--
js/ui/overviewControls.js | 25 +++----------------------
3 files changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 4f49f3d..3e50370 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -629,6 +629,7 @@ StScrollBar StButton#vhandle:active {
#overview {
spacing: 24px;
+ padding-bottom: 32px;
}
.window-caption {
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 6c5d593..263e2b7 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -231,8 +231,7 @@ const Overview = new Lang.Class({
this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
this._controls = new OverviewControls.ControlsManager(this._dash,
this._thumbnailsBox,
- this._viewSelector,
- this._searchEntryBin);
+ this._viewSelector);
// Pack all the actors into the group
this._group.add_actor(this._controls.dashActor);
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 3bbeb97..39ddc78 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -294,34 +294,15 @@ const DashSlider = new Lang.Class({
}
});
-const SlidingControlContainer = new Lang.Class({
- Name: 'SlidingControlContainer',
- Extends: St.Widget,
-
- _init: function(child, entryBin) {
- this._layout = new Clutter.BoxLayout({ vertical: true });
- this.parent({ layout_manager: this._layout });
-
- child.x_expand = true;
- this.add_actor(child);
-
- let entryClone = new Shell.GenericContainer();
- entryClone.connect('get-preferred-height', function(actor, forWidth, alloc) {
- [alloc.min_size, alloc.natural_size] = [entryBin.height, entryBin.height];
- });
- this.add_actor(entryClone);
- }
-});
-
const ControlsManager = new Lang.Class({
Name: 'ControlsManager',
- _init: function(dash, thumbnails, viewSelector, entryBin) {
+ _init: function(dash, thumbnails, viewSelector) {
this._dashSlider = new DashSlider(dash);
- this.dashActor = new SlidingControlContainer(this._dashSlider.actor, entryBin);
+ this.dashActor = this._dashSlider.actor;
this._thumbnailsSlider = new ThumbnailsSlider(thumbnails);
- this.thumbnailsActor = new SlidingControlContainer(this._thumbnailsSlider.actor, entryBin);
+ this.thumbnailsActor = this._thumbnailsSlider.actor;
this._viewSelector = viewSelector;
this._viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]