[gnome-shell/overview-relayout: 8/14] Use dash remains to implement the view selector



commit e65f519a9cb5159a2a713500eef15acbc26d3771
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Jul 28 08:30:15 2010 +0200

    Use dash remains to implement the view selector
    
    The view selector is a tabbed interface with a search entry. Starting
    a search switches focus to the results' tab, ending a search moves the
    focus back to the previously selected tab. Activating a normal tab
    while a search is active cancels the search.

 data/theme/gnome-shell.css         |   67 ++++--
 js/Makefile.am                     |    2 +-
 js/ui/{dash.js => viewSelector.js} |  540 +++++++++++++++---------------------
 po/POTFILES.in                     |    2 +-
 4 files changed, 272 insertions(+), 339 deletions(-)
---
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 26c9b70..8384277 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -376,34 +376,52 @@ StTooltip {
 }
 
 #searchEntry {
-    padding: 4px;
-    border-radius: 4px;
+    padding: 4px 8px;
+    border-radius: 12px;
     color: #a8a8a8;
-    border: 1px solid #565656;
-    background-color: #404040;
-    caret-color: #fff;
+    border: 2px solid #e8e8e8;;
+    background-color: #e8e8e8;
+    caret-color: #545454;
     caret-size: 1px;
     height: 16px;
+    width: 250px;
     transition-duration: 300;
 }
 
 #searchEntry:focus {
+    border: 2px solid #3a3aff;
     color: #545454;
-    border: 1px solid #3a3a3a;
-    background-color: #e8e8e8;
-    caret-color: #545454;
+    font-weight: bold;
     -st-shadow: 0px 0px 6px 2px rgba(255,255,255,0.9);
     transition-duration: 0;
 }
 
 #searchEntry:hover {
-    color: #a8a8a8;
-    border: 1px solid #4d4d4d;
+    border: 2px solid #e8e8e8;
     background-color: #e8e8e8;
     caret-color: #545454;
     transition-duration: 500;
 }
 
+.view-tab-title {
+    color: #888a85;
+    font-weight: bold;
+    padding: 0px 6px;
+}
+
+.view-tab-title:selected {
+    color: white;
+}
+
+.view-tab-boxpointer {
+    -arrow-border-radius: 9px;
+    -arrow-background-color: rgba(0,0,0,0.5);
+    -arrow-border-width: 2px;
+    -arrow-border-color: rgba(255,255,255,0.5);
+    -arrow-base: 30px;
+    -arrow-rise: 15px;
+}
+
 .dash-section {
     spacing: 8px;
 }
@@ -447,18 +465,33 @@ StTooltip {
     padding: 30px 10px 10px 20px;
 }
 
-#dashAppSearchResults {
-    padding: 8px 0px;
+#SearchResults {
+    padding: 20px 10px 10px 10px;
+}
+
+#SearchResultsContent {
+    padding: 0 10px;
+    spacing: 8px;
 }
 
 .dash-search-statustext,
 .dash-search-section-header {
-    padding: 4px 0px;
+    padding: 4px 12px;
     spacing: 4px;
+    color: #6f6f6f;
+}
+
+.dash-search-section {
+    background-color: rgba(128, 128, 128, .1);
+    border: 1px solid rgba(50, 50, 50, .4);
+    border-radius: 10px;
 }
 
 .dash-search-section-results {
     color: #ffffff;
+    border-radius: 10px;
+    border: 1px solid rgba(50, 50, 50, .4);
+    padding: 6px;
 }
 
 .dash-search-section-list-results {
@@ -466,14 +499,12 @@ StTooltip {
 }
 
 .dash-search-result-content {
-    padding: 3px;
+    padding: 4px;
 }
 
 .dash-search-result-content:selected {
-    padding: 2px;
-    border: 1px solid #5c5c5c;
-    border-radius: 2px;
-    background-color: #1e1e1e;
+    border-radius: 4px;
+    background: rgba(255,255,255,0.33);
 }
 
 .dash-results-container {
diff --git a/js/Makefile.am b/js/Makefile.am
index f35026e..4d4267a 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -16,7 +16,6 @@ nobase_dist_js_DATA = 	\
 	ui/boxpointer.js	\
 	ui/calendar.js		\
 	ui/chrome.js		\
-	ui/dash.js		\
 	ui/dnd.js		\
 	ui/docDisplay.js	\
 	ui/environment.js	\
@@ -45,6 +44,7 @@ nobase_dist_js_DATA = 	\
 	ui/status/accessibility.js	\
 	ui/telepathyClient.js	\
 	ui/tweener.js		\
+	ui/viewSelector.js	\
 	ui/windowAttentionHandler.js	\
 	ui/windowManager.js	\
 	ui/workspace.js		\
diff --git a/js/ui/dash.js b/js/ui/viewSelector.js
similarity index 61%
rename from js/ui/dash.js
rename to js/ui/viewSelector.js
index 530962b..f1ddd31 100644
--- a/js/ui/dash.js
+++ b/js/ui/viewSelector.js
@@ -1,17 +1,17 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
+const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 const Lang = imports.lang;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
-const AppDisplay = imports.ui.appDisplay;
+const BoxPointer = imports.ui.boxpointer;
 const DND = imports.ui.dnd;
-const DocDisplay = imports.ui.docDisplay;
-const PlaceDisplay = imports.ui.placeDisplay;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Search = imports.ui.search;
@@ -20,118 +20,6 @@ const Tweener = imports.ui.tweener;
 // 25 search results (per result type) should be enough for everyone
 const MAX_RENDERED_SEARCH_RESULTS = 25;
 
-/*
- * Returns the index in an array of a given length that is obtained
- * if the provided index is incremented by an increment and the array
- * is wrapped in if necessary.
- *
- * index: prior index, expects 0 <= index < length
- * increment: the change in index, expects abs(increment) <= length
- * length: the length of the array
- */
-function _getIndexWrapped(index, increment, length) {
-   return (index + increment + length) % length;
-}
-
-function Pane() {
-    this._init();
-}
-
-Pane.prototype = {
-    _init: function () {
-        this._open = false;
-
-        this.actor = new St.BoxLayout({ style_class: 'dash-pane',
-                                         vertical: true,
-                                         reactive: true });
-        this.actor.connect('button-press-event', Lang.bind(this, function (a, e) {
-            // Eat button press events so they don't go through and close the pane
-            return true;
-        }));
-
-        // Hidden by default
-        this.actor.hide();
-    },
-
-    open: function () {
-        if (this._open)
-            return;
-        this._open = true;
-        this.emit('open-state-changed', this._open);
-        this.actor.opacity = 0;
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: Overview.PANE_FADE_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    close: function () {
-        if (!this._open)
-            return;
-        this._open = false;
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: Overview.PANE_FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this.actor.hide();
-                               this.emit('open-state-changed', this._open);
-                           })
-                         });
-    },
-
-    destroyContent: function() {
-        let children = this.actor.get_children();
-        for (let i = 0; i < children.length; i++) {
-            children[i].destroy();
-        }
-    },
-
-    toggle: function () {
-        if (this._open)
-            this.close();
-        else
-            this.open();
-    }
-};
-Signals.addSignalMethods(Pane.prototype);
-
-function ResultArea() {
-    this._init();
-}
-
-ResultArea.prototype = {
-    _init : function() {
-        this.actor = new St.BoxLayout({ vertical: true });
-        this.resultsContainer = new St.BoxLayout({ style_class: 'dash-results-container' });
-        this.actor.add(this.resultsContainer, { expand: true });
-
-        this.display = new DocDisplay.DocDisplay();
-        this.resultsContainer.add(this.display.actor, { expand: true });
-        this.display.load();
-    }
-};
-
-function ResultPane(dash) {
-    this._init(dash);
-}
-
-ResultPane.prototype = {
-    __proto__: Pane.prototype,
-
-    _init: function(dash) {
-        Pane.prototype._init.call(this);
-
-        let resultArea = new ResultArea();
-        this.actor.add(resultArea.actor, { expand: true });
-        this.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
-            resultArea.display.resetState();
-        }));
-    }
-};
-
 function SearchEntry() {
     this._init();
 }
@@ -139,7 +27,7 @@ function SearchEntry() {
 SearchEntry.prototype = {
     _init : function() {
         this.actor = new St.Entry({ name: 'searchEntry',
-                                    hint_text: _("Find") });
+                                    hint_text: _("Search your computer") });
         this.entry = this.actor.clutter_text;
 
         this.actor.clutter_text.connect('text-changed', Lang.bind(this,
@@ -198,6 +86,8 @@ SearchEntry.prototype = {
         this.actor.set_hover(hovered);
 
         this.entry.text = '';
+        // make sure the entry gets a key-focus-out signal and sets the hint
+        global.stage.set_key_focus(this.entry);
         global.stage.set_key_focus(null);
         this.entry.set_cursor_visible(true);
         this.entry.set_selection(0, 0);
@@ -409,10 +299,23 @@ SearchResults.prototype = {
     _init: function(searchSystem) {
         this._searchSystem = searchSystem;
 
-        this.actor = new St.BoxLayout({ name: 'dashSearchResults',
-                                        vertical: true });
+        this.actor = new St.Bin({ name: 'SearchResults',
+                                  y_align: St.Align.START,
+                                  x_align: St.Align.START,
+                                  x_fill: true });
+        this._content = new St.BoxLayout({ name: 'SearchResultsContent',
+                                           vertical: true });
+
+        let scrollView = new St.ScrollView({ x_fill: true,
+                                             y_fill: false,
+                                             vshadows: true });
+        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        scrollView.add_actor(this._content);
+
+        this.actor.set_child(scrollView);
+
         this._statusText = new St.Label({ style_class: 'dash-search-statustext' });
-        this.actor.add(this._statusText);
+        this._content.add(this._statusText);
         this._selectedProvider = -1;
         this._providers = this._searchSystem.getProviders();
         this._providerMeta = [];
@@ -449,7 +352,7 @@ SearchResults.prototype = {
         this._providerMeta.push({ actor: providerBox,
                                   resultDisplay: resultDisplay,
                                   count: count });
-        this.actor.add(providerBox);
+        this._content.add(providerBox);
     },
 
     _clearDisplay: function() {
@@ -570,172 +473,156 @@ SearchResults.prototype = {
     }
 };
 
-function MoreLink() {
-    this._init();
+
+function ViewTab(label, pageActor) {
+    this._init(label, pageActor);
 }
 
-MoreLink.prototype = {
-    _init : function () {
-        this.actor = new St.BoxLayout({ style_class: 'more-link',
-                                        reactive: true });
-        this.pane = null;
+ViewTab.prototype = {
+    _init: function(label, pageActor) {
+        this.title = new St.Button({ label: label,
+                                     style_class: 'view-tab-title' });
+        this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP,
+                                                     { x_fill: true,
+                                                       y_fill: true,
+                                                       x_align: St.Align.START });
+        this._boxPointer.actor.style_class = 'view-tab-boxpointer';
+        this._boxPointer.bin.set_child(pageActor);
+        this.page = this._boxPointer.actor;
 
-        this._expander = new St.Bin({ style_class: 'more-link-expander' });
-        this.actor.add(this._expander, { expand: true, y_fill: false });
-    },
+        this.title.connect('clicked', Lang.bind(this, this._activate));
 
-    activate: function() {
-        if (!this.actor.visible)
-            return true; // If the link isn't visible we don't want the header to react
-                         // to clicks
-        if (this.pane == null) {
-            // Ensure the pane is created; the activated handler will call setPane
-            this.emit('activated');
-        }
-        this._pane.toggle();
-        return true;
+        this._arrowSet = false;
+        this.visible = false;
     },
 
-    setPane: function (pane) {
-        this._pane = pane;
-        this._pane.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
-            if (isOpen)
-                this._expander.add_style_class_name('open');
-            else
-                this._expander.remove_style_class_name('open');
-        }));
-    }
-};
-
-Signals.addSignalMethods(MoreLink.prototype);
-
-function SectionHeader(title, suppressBrowse) {
-    this._init(title, suppressBrowse);
-}
-
-SectionHeader.prototype = {
-    _init : function (title, suppressBrowse) {
-        this.actor = new St.Bin({ style_class: 'section-header',
-                                  x_align: St.Align.START,
-                                  x_fill: true,
-                                  y_fill: true,
-                                  reactive: !suppressBrowse });
-        this._innerBox = new St.BoxLayout({ style_class: 'section-header-inner' });
-        this.actor.set_child(this._innerBox);
-
-        let textBox = new St.BoxLayout({ style_class: 'section-text-content' });
-        this.text = new St.Label({ style_class: 'section-title',
-                                   text: title });
-        textBox.add(this.text, { x_align: St.Align.START });
-
-        this._innerBox.add(textBox, { expand: true });
-
-        if (!suppressBrowse) {
-            this.moreLink = new MoreLink();
-            this._innerBox.add(this.moreLink.actor, { x_align: St.Align.END });
-            this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+    show: function() {
+        this.visible = true;
+        this.page.opacity = 0;
+        this.page.show();
+
+        if (!this._arrowSet) {
+           let [titleX, titleY] = this.title.get_transformed_position();
+           let [titleWidth, titleHeight] = this.title.get_transformed_size();
+           let [tabX, tabY] = this.page.get_transformed_position();
+
+           this._boxPointer.setArrowOrigin(titleX - tabX
+                                           + Math.floor(titleWidth / 2));
+            this._arrowSet = true;
         }
+
+        Tweener.addTween(this.page,
+                         { opacity: 255,
+                           time: 0.1,
+                           transition: 'easeOutQuad' });
     },
 
-    _onButtonPress: function() {
-        this.moreLink.activate();
+    hide: function() {
+        this.visible = false;
+        Tweener.addTween(this.page,
+                         { opacity: 0,
+                           time: 0.1,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.page.hide();
+                               })
+                         });
     },
 
-    setMoreLinkVisible : function(visible) {
-        if (visible)
-            this.moreLink.actor.show();
-        else
-            this.moreLink.actor.hide();
+    _activate: function() {
+        this.emit('activated');
     }
 };
+Signals.addSignalMethods(ViewTab.prototype);
 
-Signals.addSignalMethods(SectionHeader.prototype);
 
-function SearchSectionHeader(title, onClick) {
-    this._init(title, onClick);
+function SearchTab(entryActor, pageActor) {
+    this._init(entryActor, pageActor);
 }
 
-SearchSectionHeader.prototype = {
-    _init : function(title, onClick) {
-        this.actor = new St.Button({ style_class: 'dash-search-section-header',
-                                      x_fill: true,
-                                      y_fill: true });
-        let box = new St.BoxLayout();
-        this.actor.set_child(box);
-        let titleText = new St.Label({ style_class: 'dash-search-section-title',
-                                        text: title });
-        this.countText = new St.Label({ style_class: 'dash-search-section-count' });
-
-        box.add(titleText);
-        box.add(this.countText, { expand: true, x_fill: false, x_align: St.Align.END });
-
-        this.actor.connect('clicked', onClick);
-    }
-};
-
-function Section(titleString, suppressBrowse) {
-    this._init(titleString, suppressBrowse);
-}
+SearchTab.prototype = {
+    __proto__: ViewTab.prototype,
 
-Section.prototype = {
-    _init: function(titleString, suppressBrowse) {
-        this.actor = new St.BoxLayout({ style_class: 'dash-section',
-                                         vertical: true });
-        this.header = new SectionHeader(titleString, suppressBrowse);
-        this.actor.add(this.header.actor);
-        this.content = new St.BoxLayout({ style_class: 'dash-section-content',
-                                           vertical: true });
-        this.actor.add(this.content);
+    _init: function(entryActor, pageActor) {
+        ViewTab.prototype._init.call(this, 'search', pageActor);
+        this.title.destroy();
+        this.title = entryActor;
     }
 };
 
-function Dash() {
+function ViewSelector() {
     this._init();
 }
 
-Dash.prototype = {
+ViewSelector.prototype = {
     _init : function() {
-        // dash and the popup panes need to be reactive so that the clicks in unoccupied places on them
-        // are not passed to the transparent background underneath them. This background is used for the workspaces area when
-        // the additional dash panes are being shown and it handles clicks by closing the additional panes, so that the user
-        // can interact with the workspaces. However, this behavior is not desirable when the click is actually over a pane.
-        //
-        // We have to make the individual panes reactive instead of making the whole dash actor reactive because the width
-        // of the Group actor ends up including the width of its hidden children, so we were getting a reactive object as
-        // wide as the details pane that was blocking the clicks to the workspaces underneath it even when the details pane
-        // was actually hidden.
-        this.actor = new St.BoxLayout({ name: 'dash',
-                                        vertical: true,
-                                        reactive: true });
+        this.actor = new St.BoxLayout({ name: 'ViewSelector',
+                                        vertical: true });
 
-        // The searchArea just holds the entry
-        this.searchArea = new St.BoxLayout({ name: 'dashSearchArea',
-                                             vertical: true });
-        this.sectionArea = new St.BoxLayout({ name: 'dashSections',
-                                               vertical: true });
+        this._boxContainer = new Shell.GenericContainer();
+        this.actor.add(this._boxContainer);
 
-        this.actor.add(this.searchArea);
-        this.actor.add(this.sectionArea);
+        this._boxContainer.connect('get-preferred-width',
+                                   Lang.bind(this, this._getPreferredWidth));
+        this._boxContainer.connect('get-preferred-height',
+                                   Lang.bind(this, this._getPreferredHeight));
+        this._boxContainer.connect('allocate',
+                                   Lang.bind(this, this._allocate));
 
-        // The currently active popup display
-        this._activePane = null;
+        this._tabBar = new St.BoxLayout({ name: 'ViewSelectorTabBar' });
+        this._boxContainer.add_actor(this._tabBar);
 
-        /***** Search *****/
+        // The searchArea just holds the entry
+        this.searchArea = new St.Bin({ name: 'SearchArea' });
+        this._boxContainer.add_actor(this.searchArea);
+
+        this._contentArea = new Shell.GenericContainer();
+        this._contentArea.connect('allocate', Lang.bind(this,
+            function(container, box, flags) {
+                let children = container.get_children();
+                let childBox = new Clutter.ActorBox();
+                childBox.x1 = childBox.y1 = 0;
+                childBox.x2 = box.x2 - box.x1;
+                childBox.y2 = box.y2 - box.y1;
+                for (let i = 0; i < children.length; i++)
+                    children[i].allocate(childBox, flags);
+            }));
+        this.actor.add(this._contentArea, { x_fill: true,
+                                            y_fill: true,
+                                            expand: true });
+
+        this._tabs = [];
+        this._activeTab = null;
+
+        this.constraintY = new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.Y });
+        this.constraintHeight = new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.HEIGHT });
+        this._constraintOffsetId = Main.initializeDeferredWork(this.actor,
+            Lang.bind(this, function() {
+                this.constraintY.offset = this._constraintOffset;
+            }));
+        this._constraintSourceId = Main.initializeDeferredWork(this.actor,
+            Lang.bind(this, function() {
+                if (this._activeTab) {
+                    let source = this._activeTab._boxPointer.bin;
+                    this.constraintY.set_source(source);
+                    this.constraintHeight.set_source(source);
+                }
+        }));
 
+        /***** Search *****/
         this._searchActive = false;
         this._searchPending = false;
         this._searchEntry = new SearchEntry();
-        this.searchArea.add(this._searchEntry.actor, { y_fill: false, expand: true });
+        this.searchArea.set_child(this._searchEntry.actor);
 
         this._searchSystem = new Search.SearchSystem();
-        this._searchSystem.registerProvider(new AppDisplay.AppSearchProvider());
-        this._searchSystem.registerProvider(new AppDisplay.PrefsSearchProvider());
-        this._searchSystem.registerProvider(new PlaceDisplay.PlaceSearchProvider());
-        this._searchSystem.registerProvider(new DocDisplay.DocSearchProvider());
 
         this.searchResults = new SearchResults(this._searchSystem);
-        this.actor.add(this.searchResults.actor);
-        this.searchResults.actor.hide();
+        this._searchTab = new SearchTab(this.searchArea,
+                                        this.searchResults.actor);
+        this._contentArea.add_actor(this._searchTab.page);
+        this._searchTab.hide();
 
         this._keyPressId = 0;
         this._searchTimeoutId = 0;
@@ -747,11 +634,9 @@ Dash.prototype = {
                 this.searchResults.startingSearch();
             }
             if (this._searchActive) {
-                this.searchResults.actor.show();
-                this.sectionArea.hide();
+                this._switchTab(this._searchTab);
             } else {
-                this.searchResults.actor.hide();
-                this.sectionArea.show();
+                this._switchTab(this._activeTab);
             }
             if (!this._searchActive) {
                 if (this._searchTimeoutId > 0) {
@@ -772,56 +657,94 @@ Dash.prototype = {
             this.searchResults.activateSelected();
             return true;
         }));
+    },
 
-        /***** Applications *****/
+    addViewTab: function(title, pageActor) {
+        let viewTab = new ViewTab(title, pageActor);
+        this._tabs.push(viewTab);
+        this._tabBar.add(viewTab.title);
+        this._contentArea.add_actor(viewTab.page);
+        viewTab.page.hide();
 
-        this._appsSection = new Section(_("APPLICATIONS"));
-        let appWell = new AppDisplay.AppWell();
-        this._appsSection.content.add(appWell.actor, { expand: true });
+        viewTab.connect('activated', Lang.bind(this,
+            function(tab) {
+                this._switchTab(tab);
+            }));
+    },
 
-        this._allApps = null;
-        this._appsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
-            if (this._allApps == null) {
-                this._allApps = new AppDisplay.AllAppDisplay();
-                this._addPane(this._allApps, St.Align.START);
-                link.setPane(this._allApps);
-           }
-        }));
+    _switchTab: function(tab) {
+        if (this._activeTab && this._activeTab.visible) {
+            if (this._activeTab == tab)
+                return;
+            this._activeTab.title.remove_style_pseudo_class('selected');
+            this._activeTab.hide();
+        }
 
-        this.sectionArea.add(this._appsSection.actor);
+        Main.queueDeferredWork(this._constraintSourceId);
 
-        /***** Places *****/
+        if (tab != this._searchTab) {
+            tab.title.add_style_pseudo_class('selected');
+            this._activeTab = tab;
+            if (this._searchTab.visible) {
+                this._searchTab.hide();
+                this._searchEntry.reset();
+            }
+        }
 
-        /* Translators: This is in the sense of locations for documents,
-           network locations, etc. */
-        this._placesSection = new Section(_("PLACES & DEVICES"), true);
-        let placesDisplay = new PlaceDisplay.DashPlaceDisplay();
-        this._placesSection.content.add(placesDisplay.actor, { expand: true });
-        this.sectionArea.add(this._placesSection.actor);
+        if (!tab.visible)
+            tab.show();
 
-        /***** Documents *****/
+    },
 
-        this._docsSection = new Section(_("RECENT ITEMS"));
+    _getPreferredWidth: function(box, forHeight, alloc) {
+        let children = box.get_children();
+        for (let i = 0; i < children.length; i++) {
+            let [childMin, childNat] = children[i].get_preferred_width(forHeight);
+            alloc.min_size += childMin;
+            alloc.natural_size += childNat;
+        }
+    },
 
-        this._docDisplay = new DocDisplay.DashDocDisplay();
-        this._docsSection.content.add(this._docDisplay.actor, { expand: true });
+    _getPreferredHeight: function(box, forWidth, alloc) {
+        let children = box.get_children();
+        for (let i = 0; i < children.length; i++) {
+            let [childMin, childNatural] = children[i].get_preferred_height(forWidth);
+            if (childMin > alloc.min_size)
+                alloc.min_size = childMin;
+            if (childNatural > alloc.natural_size)
+                alloc.natural_size = childNatural;
+        }
+    },
 
-        this._moreDocsPane = null;
-        this._docsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
-            if (this._moreDocsPane == null) {
-                this._moreDocsPane = new ResultPane(this);
-                this._addPane(this._moreDocsPane, St.Align.END);
-                link.setPane(this._moreDocsPane);
-           }
-        }));
+    _allocate: function(container, box, flags) {
+        let allocWidth = box.x2 - box.x1;
+        let allocHeight = box.y2 - box.y1;
 
-        this._docDisplay.connect('changed', Lang.bind(this, function () {
-            this._docsSection.header.setMoreLinkVisible(
-                this._docDisplay.actor.get_children().length > 0);
-        }));
-        this._docDisplay.emit('changed');
+        let [searchMinWidth, searchNatWidth] = this.searchArea.get_preferred_width(-1);
+        let [barMinWidth, barNatWidth] = this._tabBar.get_preferred_width(-1);
+        let childBox = new Clutter.ActorBox();
+        childBox.y1 = 0;
+        childBox.y2 = allocHeight;
+        if (this.actor.get_direction() == St.TextDirection.RTL) {
+            childBox.x1 = allocWidth - barNatWidth;
+            childBox.x2 = allocWidth;
+        } else {
+            childBox.x1 = 0;
+            childBox.x2 = barNatWidth;
+        }
+        this._tabBar.allocate(childBox, flags);
+
+        if (this.actor.get_direction() == St.TextDirection.RTL) {
+            childBox.x1 = 0;
+            childBox.x2 = searchNatWidth;
+        } else {
+            childBox.x1 = allocWidth - searchNatWidth;
+            childBox.x2 = allocWidth;
+        }
+        this.searchArea.allocate(childBox, flags);
 
-        this.sectionArea.add(this._docsSection.actor, { expand: true });
+        this._constraintOffset = this.actor.y + box.y2;
+        Main.queueDeferredWork(this._constraintOffsetId);
     },
 
     _onKeyPress: function(stage, event) {
@@ -834,12 +757,6 @@ Dash.prototype = {
 
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.Escape) {
-            // If we're in one of the "more" modes or showing the
-            // details pane, close them
-            if (this._activePane != null)
-                this._activePane.close();
-            // Otherwise, just close the Overview entirely
-            else
                 Main.overview.hide();
             return true;
         } else if (symbol == Clutter.Up) {
@@ -874,6 +791,9 @@ Dash.prototype = {
     },
 
     show: function() {
+        if (this._tabs.length > 0)
+            this._switchTab(this._tabs[0]);
+
         this._searchEntry.show();
         if (this._keyPressId == 0)
             this._keyPressId = global.stage.connect('key-press-event',
@@ -881,33 +801,15 @@ Dash.prototype = {
     },
 
     hide: function() {
+        if (this._tabs.length > 0)
+            this._switchTab(this._tabs[0]);
+
         this._firstSelectAfterOverlayShow = true;
         this._searchEntry.hide();
-        if (this._activePane != null)
-            this._activePane.close();
         if (this._keyPressId > 0) {
             global.stage.disconnect(this._keyPressId);
             this._keyPressId = 0;
         }
-    },
-
-    closePanes: function () {
-        if (this._activePane != null)
-            this._activePane.close();
-    },
-
-    _addPane: function(pane, align) {
-        pane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
-            if (isOpen) {
-                if (pane != this._activePane && this._activePane != null) {
-                    this._activePane.close();
-                }
-                this._activePane = pane;
-            } else if (pane == this._activePane) {
-                this._activePane = null;
-            }
-        }));
-        Main.overview.addPane(pane, align);
     }
 };
-Signals.addSignalMethods(Dash.prototype);
+Signals.addSignalMethods(ViewSelector.prototype);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 97b956b..ac0abb5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ data/org.gnome.accessibility.magnifier.gschema.xml.in
 [type: gettext/glade]data/clock-preferences.ui
 js/ui/appDisplay.js
 js/ui/appFavorites.js
-js/ui/dash.js
 js/ui/docDisplay.js
 js/ui/lookingGlass.js
 js/ui/overview.js
@@ -14,6 +13,7 @@ js/ui/placeDisplay.js
 js/ui/popupMenu.js
 js/ui/runDialog.js
 js/ui/statusMenu.js
+js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js
 js/ui/workspacesView.js
 src/gdmuser/gdm-user.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]