[gnome-maps] Add size to CreateActorFromIconName
- From: Jonas Danielsson <jonasdn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps] Add size to CreateActorFromIconName
- Date: Fri, 16 Jan 2015 08:30:20 +0000 (UTC)
commit 54366b5c2fccc38a25f5425731282a8e0a677625
Author: Jonas Danielsson <jonas threetimestwo org>
Date: Wed Jan 7 05:42:14 2015 -0500
Add size to CreateActorFromIconName
https://bugzilla.gnome.org/show_bug.cgi?id=742514
src/searchResultMarker.js | 2 +-
src/turnPointMarker.js | 2 +-
src/userLocationMarker.js | 2 +-
src/utils.js | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/searchResultMarker.js b/src/searchResultMarker.js
index a4fc7f8..50a28f3 100644
--- a/src/searchResultMarker.js
+++ b/src/searchResultMarker.js
@@ -33,7 +33,7 @@ const SearchResultMarker = new Lang.Class({
_init: function(params) {
this.parent(params);
- this.add_actor(Utils.CreateActorFromIconName('maps-pin'));
+ this.add_actor(Utils.CreateActorFromIconName('maps-pin', 0));
},
get anchor() {
diff --git a/src/turnPointMarker.js b/src/turnPointMarker.js
index 19a841d..24ea6d7 100644
--- a/src/turnPointMarker.js
+++ b/src/turnPointMarker.js
@@ -106,7 +106,7 @@ const DestinationMarker = new Lang.Class({
this._onMarkerDrag();
}).bind(this));
- this.add_actor(Utils.CreateActorFromIconName(this.iconName));
+ this.add_actor(Utils.CreateActorFromIconName(this.iconName, 0));
},
_onMarkerDrag: function() {
diff --git a/src/userLocationMarker.js b/src/userLocationMarker.js
index ca114c3..bab0cc0 100644
--- a/src/userLocationMarker.js
+++ b/src/userLocationMarker.js
@@ -71,7 +71,7 @@ const UserLocationMarker = new Lang.Class({
_init: function(params) {
this.parent(params);
- this.add_actor(Utils.CreateActorFromIconName('user-location'));
+ this.add_actor(Utils.CreateActorFromIconName('user-location', 0));
if (this.place.location.accuracy > 0) {
this._accuracyMarker = new AccuracyCircleMarker({ place: this.place });
diff --git a/src/utils.js b/src/utils.js
index 9286152..485785e 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -165,10 +165,10 @@ function activateAction(appId, action, parameter, timestamp) {
});
}
-function CreateActorFromIconName(name) {
+function CreateActorFromIconName(name, size) {
try {
let theme = Gtk.IconTheme.get_default();
- let pixbuf = theme.load_icon(name, 0, 0);
+ let pixbuf = theme.load_icon(name, size, 0);
let image = new Clutter.Image();
image.set_data(pixbuf.get_pixels(),
Cogl.PixelFormat.RGBA_8888,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]