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

Merge branch 'master' into overlay-design02

Browse Source
This commit is contained in:
Colin Walters 2009-06-04 17:43:48 -04:00
commit dae1d94258
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/overlay.js
View File

@ -46,7 +46,7 @@ const DETAILS_BORDER_COLOR = new Clutter.Color();
DETAILS_BORDER_COLOR.from_pixel(0xffffffff); DETAILS_BORDER_COLOR.from_pixel(0xffffffff);
// Time for initial animation going into overlay mode // Time for initial animation going into overlay mode
const ANIMATION_TIME = 0.5; const ANIMATION_TIME = 0.25;
// We divide the screen into a grid of rows and columns, which we use // We divide the screen into a grid of rows and columns, which we use
// to help us position the overlay components, such as the side panel // to help us position the overlay components, such as the side panel

8
js/ui/panel.js
View File

@ -12,7 +12,7 @@ const Button = imports.ui.button;
const Main = imports.ui.main; const Main = imports.ui.main;
const PANEL_HEIGHT = 32; const PANEL_HEIGHT = 32;
const TRAY_HEIGHT = 28; const TRAY_HEIGHT = PANEL_HEIGHT - 1;
const SHADOW_HEIGHT = 6; const SHADOW_HEIGHT = 6;
// The panel has a transparent white background with a gradient. // The panel has a transparent white background with a gradient.
@ -34,7 +34,7 @@ PANEL_BUTTON_COLOR.from_pixel(0x00000015);
const PRESSED_BUTTON_BACKGROUND_COLOR = new Clutter.Color(); const PRESSED_BUTTON_BACKGROUND_COLOR = new Clutter.Color();
PRESSED_BUTTON_BACKGROUND_COLOR.from_pixel(0x00000030); PRESSED_BUTTON_BACKGROUND_COLOR.from_pixel(0x00000030);
const TRAY_PADDING = 2; const TRAY_PADDING = 0;
const TRAY_SPACING = 2; const TRAY_SPACING = 2;
// Used for the tray icon container with gtk pre-2.16, which doesn't // Used for the tray icon container with gtk pre-2.16, which doesn't
@ -44,7 +44,7 @@ TRAY_BACKGROUND_COLOR.from_pixel(0xefefefff);
const TRAY_BORDER_COLOR = new Clutter.Color(); const TRAY_BORDER_COLOR = new Clutter.Color();
TRAY_BORDER_COLOR.from_pixel(0x00000033); TRAY_BORDER_COLOR.from_pixel(0x00000033);
const TRAY_CORNER_RADIUS = 5; const TRAY_CORNER_RADIUS = 5;
const TRAY_BORDER_WIDTH = 1; const TRAY_BORDER_WIDTH = 0;
function Panel() { function Panel() {
this._init(); this._init();
@ -118,7 +118,7 @@ Panel.prototype = {
// The tray icons live in trayBox within trayContainer. // The tray icons live in trayBox within trayContainer.
// The trayBox is hidden when there are no tray icons. // The trayBox is hidden when there are no tray icons.
let trayContainer = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL, let trayContainer = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
y_align: Big.BoxAlignment.CENTER }); y_align: Big.BoxAlignment.START });
box.append(trayContainer, Big.BoxPackFlags.END); box.append(trayContainer, Big.BoxPackFlags.END);
let trayBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL, let trayBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
height: TRAY_HEIGHT, height: TRAY_HEIGHT,

2
src/shell-app-monitor.c
View File

@ -326,7 +326,7 @@ get_active_app_properties (ShellAppMonitor *monitor,
return; return;
*wm_class = g_strdup (meta_window_get_wm_class (active)); *wm_class = g_strdup (meta_window_get_wm_class (active));
*title = g_strdup (meta_window_get_description (active)); g_object_get (active, "title", title, NULL);
} }
void void