brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js: Fix up for Clutter.Color changes

Browse Source 
Spotted by darkxst on IRC.

https://bugzilla.gnome.org/show_bug.cgi?id=683073
This commit is contained in:
Jasper St. Pierre 2012-08-30 21:38:21 -03:00
parent df15ee4074
commit e616877fd2
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/ui/lookingGlass.js
View File

@ -38,7 +38,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
/* Utility functions...we should probably be able to use these /* Utility functions...we should probably be able to use these
* in the shell core code too. */ * in the shell core code too. */
'const stage = global.stage; ' + 'const stage = global.stage; ' +
'const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; ' +
/* Special lookingGlass functions */ /* Special lookingGlass functions */
'const it = Main.lookingGlass.getIt(); ' + 'const it = Main.lookingGlass.getIt(); ' +
'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); '; 'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

7
js/ui/magnifier.js
View File

@ -303,8 +303,7 @@ const Magnifier = new Lang.Class({
*/ */
setCrosshairsColor: function(color) { setCrosshairsColor: function(color) {
if (this._crossHairs) { if (this._crossHairs) {
let clutterColor = new Clutter.Color(); let [res, clutterColor] = Clutter.Color.from_string(color);
clutterColor.from_string(color);
this._crossHairs.setColor(clutterColor); this._crossHairs.setColor(clutterColor);
} }
}, },
@ -1472,9 +1471,7 @@ const Crosshairs = new Lang.Class({
* @color: The color as a Clutter.Color. * @color: The color as a Clutter.Color.
*/ */
getColor: function() { getColor: function() {
let clutterColor = new Clutter.Color(); return this._horizLeftHair.get_color();
this._horizLeftHair.get_color(clutterColor);
return clutterColor;
}, },
/** /**

3
js/ui/main.js
View File

@ -43,8 +43,7 @@ const XdndHandler = imports.ui.xdndHandler;
const Util = imports.misc.util; const Util = imports.misc.util;
const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides'; const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
const DEFAULT_BACKGROUND_COLOR = new Clutter.Color(); const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2266bbff);
DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
let automountManager = null; let automountManager = null;
let autorunManager = null; let autorunManager = null;