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

Implement distinct 2-window and multi-window highlights

Browse Source
This commit is contained in:
Dan Winship 2009-08-13 10:10:50 -04:00
parent 059c330d95
commit 51db34d223
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/appDisplay.js
View File

@ -488,7 +488,7 @@ WellDisplayItem.prototype = {
let glow = new Shell.DrawingArea({}); let glow = new Shell.DrawingArea({});
glow.connect('redraw', Lang.bind(this, function (e, tex) { glow.connect('redraw', Lang.bind(this, function (e, tex) {
Shell.draw_app_highlight(tex, Shell.draw_app_highlight(tex,
this._windows.length > 1, this._windows.length,
GLOW_COLOR.red / 255, GLOW_COLOR.red / 255,
GLOW_COLOR.green / 255, GLOW_COLOR.green / 255,
GLOW_COLOR.blue / 255, GLOW_COLOR.blue / 255,

46
src/shell-drawing.c
View File

@ -168,7 +168,7 @@ draw_glow (cairo_t *cr, double red, double green, double blue, double alpha)
void void
shell_draw_app_highlight (ClutterCairoTexture *texture, shell_draw_app_highlight (ClutterCairoTexture *texture,
gboolean multi, int num_windows,
double red, double red,
double green, double green,
double blue, double blue,
@ -177,6 +177,8 @@ shell_draw_app_highlight (ClutterCairoTexture *texture,
cairo_t *cr; cairo_t *cr;
guint width, height; guint width, height;
g_return_if_fail (num_windows > 0);
clutter_cairo_texture_get_surface_size (texture, &width, &height); clutter_cairo_texture_get_surface_size (texture, &width, &height);
clutter_cairo_texture_clear (texture); clutter_cairo_texture_clear (texture);
@ -185,28 +187,38 @@ shell_draw_app_highlight (ClutterCairoTexture *texture,
cairo_save (cr); cairo_save (cr);
cairo_translate (cr, width / 2.0, height / 2.0); cairo_translate (cr, width / 2.0, height / 2.0);
if (multi) if (num_windows == 1)
{ {
double scale; cairo_scale (cr, width / 2.0, height / 2.0);
/* 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); draw_glow (cr, red, green, blue, alpha);
} }
else else
{ {
cairo_scale (cr, width / 2.0, height / 2.0); int num_circles;
double scale, highlight_width;
num_circles = num_windows == 2 ? 2 : 3;
/* The circles will have radius 1.0 (diameter 2.0) and overlap
* by 0.2, so the total width of the highlight is:
*/
highlight_width = 2.0 * num_circles - 0.2 * (num_circles - 1);
scale = MIN (height / 2.0, width / highlight_width);
cairo_scale (cr, scale, scale);
/* Leftmost circle first; its left side is at
* -highlight_width/2, so its center is that plus 1.
*/
cairo_translate (cr, -highlight_width / 2.0 + 1.0, 0.0);
draw_glow (cr, red, green, blue, alpha); draw_glow (cr, red, green, blue, alpha);
/* Remaining circles */
while (--num_circles)
{
cairo_translate (cr, 1.8, 0.0);
draw_glow (cr, red, green, blue, alpha);
}
} }
cairo_restore (cr); cairo_restore (cr);

2
src/shell-drawing.h
View File

@ -18,7 +18,7 @@ void shell_draw_clock (ClutterCairoTexture *texture,
int minute); int minute);
void shell_draw_app_highlight (ClutterCairoTexture *texture, void shell_draw_app_highlight (ClutterCairoTexture *texture,
gboolean multi, int num_windows,
double red, double red,
double blue, double blue,
double green, double green,