[gnome-maps] mapBubble: Remove icon



commit 0395eb60d9547caba752d22f53a5dc3efbfbc743
Author: James Westman <james flyingpimonster net>
Date:   Wed Aug 5 19:25:16 2020 -0500

    mapBubble: Remove icon
    
    The icon will be redone differently for different types of bubbles. Places will
    use a much larger thumbnail at the top of the bubble. Contacts will use a
    HdyAvatar. Current location bubbles will no longer have an icon.

 data/ui/map-bubble.ui     | 34 ----------------------------------
 src/mapBubble.js          | 18 ------------------
 src/placeBubble.js        |  5 +----
 src/userLocationBubble.js |  3 ---
 4 files changed, 1 insertion(+), 59 deletions(-)
---
diff --git a/data/ui/map-bubble.ui b/data/ui/map-bubble.ui
index c5971dae..07f188c1 100644
--- a/data/ui/map-bubble.ui
+++ b/data/ui/map-bubble.ui
@@ -125,39 +125,5 @@
         <property name="top_attach">1</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkStack" id="bubble-icon-stack">
-        <property name="visible">True</property>
-        <property name="transition-type">GTK_STACK_TRANSITION_TYPE_CROSSFADE</property>
-        <child>
-          <object class="GtkImage" id="bubble-image">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <property name="pixel_size">0</property>
-            <property name="icon_size">16</property>
-          </object>
-          <packing>
-            <property name="name">icon</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkImage" id="bubble-thumbnail">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <property name="pixel_size">0</property>
-            <property name="icon_size">16</property>
-          </object>
-          <packing>
-            <property name="name">thumbnail</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">2</property>
-        <property name="top_attach">1</property>
-      </packing>
-    </child>
   </object>
 </interface>
diff --git a/src/mapBubble.js b/src/mapBubble.js
index 25fb4a4d..3c7fd589 100644
--- a/src/mapBubble.js
+++ b/src/mapBubble.js
@@ -70,9 +70,6 @@ class MapBubble extends Gtk.Popover {
 
         super._init(params);
         let ui = Utils.getUIObject('map-bubble', [ 'bubble-main-grid',
-                                                   'bubble-image',
-                                                   'bubble-thumbnail',
-                                                   'bubble-icon-stack',
                                                    'bubble-content-area',
                                                    'bubble-button-area',
                                                    'bubble-route-button',
@@ -81,9 +78,6 @@ class MapBubble extends Gtk.Popover {
                                                    'bubble-check-in-button',
                                                    'bubble-edit-button',
                                                    'bubble-favorite-button-image']);
-        this._image = ui.bubbleImage;
-        this._thumbnail = ui.bubbleThumbnail;
-        this._iconStack = ui.bubbleIconStack;
         this._content = ui.bubbleContentArea;
 
         if (!buttonFlags)
@@ -104,18 +98,6 @@ class MapBubble extends Gtk.Popover {
         this.add(ui.bubbleMainGrid);
     }
 
-    get image() {
-        return this._image;
-    }
-
-    get thumbnail() {
-        return this._thumbnail;
-    }
-
-    get iconStack() {
-        return this._iconStack;
-    }
-
     get place() {
         return this._place;
     }
diff --git a/src/placeBubble.js b/src/placeBubble.js
index 107ac79a..645cf66b 100644
--- a/src/placeBubble.js
+++ b/src/placeBubble.js
@@ -71,8 +71,6 @@ var PlaceBubble = GObject.registerClass({
 
         super._init(params);
 
-        Utils.load_icon(this.place.icon, 48, (pixbuf) => this.image.pixbuf = pixbuf);
-
         this._stack = ui.stack;
         this._title = ui.labelTitle;
         this._boxContent = ui.boxContent;
@@ -275,8 +273,7 @@ var PlaceBubble = GObject.registerClass({
 
     _onThumbnailComplete(thumbnail) {
         if (thumbnail) {
-            this.thumbnail.pixbuf = this._cropAndScaleThumbnail(thumbnail);
-            this.iconStack.visible_child_name = 'thumbnail';
+            // TODO: Add thumbnails back
         }
     }
 
diff --git a/src/userLocationBubble.js b/src/userLocationBubble.js
index 77320e53..1f47129f 100644
--- a/src/userLocationBubble.js
+++ b/src/userLocationBubble.js
@@ -41,9 +41,6 @@ class UserLocationBubble extends MapBubble.MapBubble {
 
         super._init(params);
 
-        this.image.icon_name = 'find-location-symbolic';
-        this.image.pixel_size = 48;
-
         this.updateLocation();
         this.content.add(this._ui.gridContent);
     }


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