[gnome-shell/wip/paging-release: 59/90] fixed frequent apps css spacing calculation, since the box passed didn't take into account the grid



commit bca5428062009a0532144363fee5267d3e10093d
Author: Carlos Soriano <carlos soriano89 gmail com>
Date:   Thu Jul 18 19:31:26 2013 +0200

    fixed frequent apps css spacing calculation, since the box passed didn't
    take into account the grid spacing in updateDisplaySize, which is the
    widget which has the right padding

 data/theme/gnome-shell.css |    4 ++--
 js/ui/appDisplay.js        |   19 ++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 6447186..06ea562 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -900,9 +900,9 @@ StScrollBar StButton#vhandle:active {
 
 .search-display > StBoxLayout,
 .all-apps,
-.frequent-apps > StBoxLayout {
+.frequent-apps > StBoxLayout{
     /* horizontal padding to make sure scrollbars or dash don't overlap content */
-    padding: 8px 88px;
+    padding: 10px 88px;
 }
 
 .pages-indicator {
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index c33fffd..78dcaca 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -612,15 +612,8 @@ const PaginationIconIndicator = new Lang.Class({
     }
 });
 
-const PaginationIndicatorActor = new Lang.Class({
-    Name: 'PaginationIndicatorActor',
-    Extends: St.Widget,
-
-    
-});
-
-const IndicatorLayout = new Lang.Class({
-    Name:'IndicatorLayout',
+const PaginationIndicator = new Lang.Class({
+    Name:'PaginationIndicator',
     
     _init: function(params) {
         params['y_expand'] = true;
@@ -703,11 +696,8 @@ const AllView = new Lang.Class({
         let paginationScrollViewParams = {style_class: 'all-apps'};
         this._paginationView = new PaginationScrollView(this, paginationScrollViewParams);
 
-        this._paginationIndicatorLayout = new IndicatorLayout({style_class: 'pages-indicator'});
-        this._paginationIndicatorLayout._nPages = 0;
-        this._paginationIndicator = new IndicatorLayout({style_class: 'pages-indicator'});
+        this._paginationIndicator = new PaginationIndicator({style_class: 'pages-indicator'});
         this._paginationIndicator._nPages = 0;
-        //this._paginationIndicator.set_layout_manager(this._paginationIndicatorLayout);
         let layout = new Clutter.BinLayout();
         this.actor = new St.Widget({ layout_manager: layout, 
                                      x_expand:true, y_expand:true });
@@ -731,7 +721,6 @@ const AllView = new Lang.Class({
     _updatedNPages: function(iconGrid, nPages) {
         // We don't need a relayout because we already done it at iconGrid
         // when pages are calculated (and then the signal is emitted before that)");
-        this._paginationIndicatorLayout._nPages = nPages;
         this._paginationIndicator._nPages = nPages;
         this._paginationView.invalidatePagination = true;
     },
@@ -826,9 +815,9 @@ const FrequentView = new Lang.Class({
         box.y1 = 0;
         box.y2 = height;
         box = this.actor.get_theme_node().get_content_box(box);
+        box = this._grid.actor.get_theme_node().get_content_box(box);
         let availWidth = box.x2 - box.x1;
         let availHeight = box.y2 - box.y1;
-        //FIXME
         let spacing = this._grid.maxSpacingForWidthHeight(availWidth, availHeight, MIN_COLUMNS, MIN_ROWS, 
true);
         this._grid.top_padding = spacing;
         this._grid.bottom_padding = spacing;


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