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

Implement the multi-window highlight on WellDisplayItem

Browse Source
This commit is contained in:
Dan Winship 2009-08-12 15:53:42 -04:00
parent 15a3f39f65
commit 4b47803162
3 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/appDisplay.js
View File

@ -487,11 +487,12 @@ WellDisplayItem.prototype = {
if (this._windows.length > 0) {
let glow = new Shell.DrawingArea({});
glow.connect('redraw', Lang.bind(this, function (e, tex) {
Shell.draw_glow(tex,
GLOW_COLOR.red / 255,
GLOW_COLOR.green / 255,
GLOW_COLOR.blue / 255,
GLOW_COLOR.alpha / 255);
Shell.draw_app_highlight(tex,
this._windows.length > 1,
GLOW_COLOR.red / 255,
GLOW_COLOR.green / 255,
GLOW_COLOR.blue / 255,
GLOW_COLOR.alpha / 255);
}));
this._name.connect('notify::allocation', Lang.bind(this, function () {
let x = this._name.x;
@ -764,10 +765,10 @@ AppWell.prototype = {
this._appSystem.connect('favorites-changed', Lang.bind(this, function(appSys) {
this._redisplay();
}));
this._appMonitor.connect('app-added', Lang.bind(this, function(monitor) {
this._appMonitor.connect('window-added', Lang.bind(this, function(monitor) {
this._redisplay();
}));
this._appMonitor.connect('app-removed', Lang.bind(this, function(monitor) {
this._appMonitor.connect('window-removed', Lang.bind(this, function(monitor) {
this._redisplay();
}));

64
src/shell-drawing.c
View File

@ -146,25 +146,12 @@ shell_draw_clock (ClutterCairoTexture *texture,
cairo_destroy (cr);
}
void
shell_draw_glow (ClutterCairoTexture *texture,
double red,
double green,
double blue,
double alpha)
static void
draw_glow (cairo_t *cr, double red, double green, double blue, double alpha)
{
cairo_t *cr;
guint width, height;
cairo_pattern_t *gradient;
clutter_cairo_texture_get_surface_size (texture, &width, &height);
clutter_cairo_texture_clear (texture);
cr = clutter_cairo_texture_create (texture);
cairo_save (cr);
cairo_translate (cr, width / 2.0, height / 2.0);
cairo_scale (cr, width / 2.0, height / 2.0);
gradient = cairo_pattern_create_radial (0.0, 0.0, 0.0, 0.0, 0.0, 1.0);
cairo_pattern_add_color_stop_rgba (gradient, 0.0, red, green, blue, alpha);
@ -174,8 +161,55 @@ shell_draw_glow (ClutterCairoTexture *texture,
cairo_arc (cr, 0.0, 0.0, 1.0, 0.0, 2.0 * M_PI);
cairo_fill (cr);
cairo_restore (cr);
cairo_pattern_destroy (gradient);
}
void
shell_draw_app_highlight (ClutterCairoTexture *texture,
gboolean multi,
double red,
double green,
double blue,
double alpha)
{
cairo_t *cr;
guint width, height;
clutter_cairo_texture_get_surface_size (texture, &width, &height);
clutter_cairo_texture_clear (texture);
cr = clutter_cairo_texture_create (texture);
cairo_save (cr);
cairo_translate (cr, width / 2.0, height / 2.0);
if (multi)
{
double scale;
/* We draw three circles of radius 1, at 0.0, -1.8, and +1.8.
* Total width is therefore 1 + 1.8 + 1.8 + 1 = 5.6.
*/
scale = MIN (height / 2.0, width / 5.6);
cairo_scale (cr, scale, scale);
draw_glow (cr, red, green, blue, alpha);
cairo_translate (cr, -1.8, 0.0);
draw_glow (cr, red, green, blue, alpha);
cairo_translate (cr, 3.6, 0.0);
draw_glow (cr, red, green, blue, alpha);
}
else
{
cairo_scale (cr, width / 2.0, height / 2.0);
draw_glow (cr, red, green, blue, alpha);
}
cairo_restore (cr);
cairo_destroy (cr);
}

11
src/shell-drawing.h
View File

@ -17,11 +17,12 @@ void shell_draw_clock (ClutterCairoTexture *texture,
int hour,
int minute);
void shell_draw_glow (ClutterCairoTexture *texture,
double red,
double blue,
double green,
double alpha);
void shell_draw_app_highlight (ClutterCairoTexture *texture,
gboolean multi,
double red,
double blue,
double green,
double alpha);
guint shell_add_hook_paint_red_border (ClutterActor *actor);