mitch/gnome-shell-teatime
1
0
Fork 0
mirror of https://github.com/oleid/gnome-shell-teatime.git synced 2022-04-29 18:53:50 +00:00
Code Issues Projects Releases Wiki Activity

fix theme color issues and textual coutdown layout

Browse Source
This commit is contained in:
Olaf Leidinger 2014-10-14 22:10:49 +02:00
parent 28550c9072
commit 3e6ad50e37
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/extension.js
View File

@ -162,7 +162,9 @@ const TeaTime = new Lang.Class({
icon_size: 20 }); icon_size: 20 });
} }
// set timer widget // set timer widget
this._textualTimer = new St.Label({ text: "" }); this._textualTimer = new St.Label({ text: "",
x_align: Clutter.ActorAlign.END,
y_align: Clutter.ActorAlign.CENTER });
this._graphicalTimer = new St.DrawingArea({ this._graphicalTimer = new St.DrawingArea({
reactive : true reactive : true
}); });
@ -171,7 +173,6 @@ const TeaTime = new Lang.Class({
this._graphicalTimer.connect('repaint', Lang.bind(this, this._drawTimer)); this._graphicalTimer.connect('repaint', Lang.bind(this, this._drawTimer));
this.actor.add_actor(this._logo); this.actor.add_actor(this._logo);
this._idleTimeout = null; this._idleTimeout = null;
this._createMenu(); this._createMenu();
@ -355,21 +356,20 @@ const TeaTime = new Lang.Class({
let pi = Math.PI; let pi = Math.PI;
let r = Math.min(width, height) * 0.5;; let r = Math.min(width, height) * 0.5;;
// TODO: get colors from current theme! cr.setSourceRGBA(0, 0, 0, 0);
cr.setSourceRGB(0, 0, 0);
cr.rectangle(0, 0, width, height); cr.rectangle(0, 0, width, height);
cr.fill(); cr.fill();
cr.translate(Math.floor(width / 2), Math.floor(height / 2)); cr.translate(Math.floor(width / 2), Math.floor(height / 2));
cr.save(); cr.save();
cr.setSourceRGB(0.2, 0.2, 0.2); Utils.setCairoColorFromClutter(cr, this._secondaryColor);
cr.moveTo(0, 0); cr.moveTo(0, 0);
cr.arc(0, 0, r, 3 / 2 * pi + 2 * pi * this._progress, 3 / 2 * pi + 2 cr.arc(0, 0, r, 3 / 2 * pi + 2 * pi * this._progress, 3 / 2 * pi + 2
* pi); * pi);
cr.fill(); cr.fill();
cr.setSourceRGB(0.8, 0.8, 0.8); Utils.setCairoColorFromClutter(cr, this._primaryColor);
cr.moveTo(0, 0); cr.moveTo(0, 0);
cr.arc(0, 0, r, 3 / 2 * pi, 3 / 2 * pi + 2 * pi * this._progress); cr.arc(0, 0, r, 3 / 2 * pi, 3 / 2 * pi + 2 * pi * this._progress);
cr.fill(); cr.fill();
@ -383,11 +383,21 @@ const TeaTime = new Lang.Class({
_showPreferences : function() { _showPreferences : function() {
imports.misc.util.spawn(["gnome-shell-extension-prefs", ExtensionUtils.getCurrentExtension().metadata['uuid']]); imports.misc.util.spawn(["gnome-shell-extension-prefs", ExtensionUtils.getCurrentExtension().metadata['uuid']]);
return 0; return 0;
},
_onStyleChanged: function(actor) {
let themeNode = actor.get_theme_node();
let color = themeNode.get_foreground_color()
this._primaryColor = color;
this._secondaryColor = new Clutter.Color({
red: color.red,
green: color.green,
blue: color.blue,
alpha: color.alpha*0.3
});
} }
}); });
function init(metadata) { function init(metadata) {
// TODO: at some point, add translations
let theme = imports.gi.Gtk.IconTheme.get_default(); let theme = imports.gi.Gtk.IconTheme.get_default();
theme.append_search_path(metadata.path); theme.append_search_path(metadata.path);
} }

5
src/utils.js
View File

@ -89,3 +89,8 @@ function playSound(uri) {
player.set_property('uri', uri); player.set_property('uri', uri);
player.set_state(Gst.State.PLAYING); player.set_state(Gst.State.PLAYING);
} }
function setCairoColorFromClutter(cr, c) {
let s=1.0/255;
cr.setSourceRGBA(s*c.red, s*c.green, s*c.blue, s*c.alpha);
}