Arrow on sidebar button is always there.

Previously, the arrow on the sidebar back button
for the article page would only appear on hover.
Now it appears always, as per design request.

[endlessm/eos-sdk#352]

3 files changed, 7 insertions, 43 deletions

diff --git a/wikipedia/Makefile.am.inc b/wikipedia/Makefile.am.inc
index ba7e4e8..c816f5b 100644
--- a/wikipedia/Makefile.am.inc
+++ b/wikipedia/Makefile.am.inc
@@ -30,7 +30,6 @@ js_sources = \
 	wikipedia/PrebuiltCategoryPage.js \
 	wikipedia/PrebuiltFrontPage.js \
 	wikipedia/PrebuiltWikipediaApplication.js \
-	wikipedia/widgets/SideBarButton.js \
 	wikipedia/widgets/ListTextButton.js \
 	wikipedia/config.js \
 	wikipedia/widgets/scaled_image.js \
diff --git a/wikipedia/views/domain_wiki_view.js b/wikipedia/views/domain_wiki_view.js
index e5ed378..3462702 100644
--- a/wikipedia/views/domain_wiki_view.js
+++ b/wikipedia/views/domain_wiki_view.js
@@ -71,10 +71,14 @@ const DomainWikiView = new Lang.Class({
         });
         this._sidebar_frame.set_size_request(40, -1);
 
-        this._article_sidebar_back_button = new SideBarButton.SideBarButton(SIDEBAR_BACK_BUTTON_URI, {
+        this._article_sidebar_back_button = new Gtk.Button({
             name: "side_bar_button",
-            vexpand: true
-        });
+            vexpand: true,
+            image: new Gtk.Image({
+                resource: SIDEBAR_BACK_BUTTON_URI
+            })
+        })
+
         this._article_view = new EndlessWikipedia.PrebuiltArticlesPage();
         this._article_list = new EndlessWikipedia.ArticleList({
             halign: Gtk.Align.START,
diff --git a/wikipedia/widgets/SideBarButton.js b/wikipedia/widgets/SideBarButton.js
deleted file mode 100644
index b602d6c..0000000
--- a/wikipedia/widgets/SideBarButton.js
+++ /dev/null
@@ -1,39 +0,0 @@
-const Lang = imports.lang;
-const Gdk = imports.gi.Gdk;
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gtk = imports.gi.Gtk;
-
-const SideBarButton = new Lang.Class({
-    Name: 'EndlessSideBarButton',
-    Extends: Gtk.Button,
-
-    // This is a button for the article list widget. It has a label and an icon image.
-    // The icon image will only appear on hover or press of button
-    _init: function(hover_icon_path, params) {
-        this.parent(params);
-
-        this.set_size_request(40, -1);
-
-        this._image = new Gtk.Image({
-            resource: hover_icon_path,
-            no_show_all: true
-        });
-
-        this.add(this._image);
-
-        this.connect('state-changed', Lang.bind(this, this._update_appearance));
-    },
-
-    _update_appearance: function(widget, state) {
-        // If button is hovered over and/or pressed, then show the arrow icon
-        if (widget.get_state_flags() & Gtk.StateFlags.ACTIVE || 
-            widget.get_state_flags() & Gtk.StateFlags.PRELIGHT) {
-            this._image.show();
-            return false; // don't block event
-        }
-        // If no hover or press, then hide the arrow icon
-        this._image.hide();
-        return false; // don't block event
-    }
-});
-