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

Change selected item color and make sure only one item is selected at a time

Browse Source 
A blue selected item color fits better with the new color scheme than a green one.

Only one item should be selected across all the displays we are showing.
This commit is contained in:
Marina Zhurakhinskaya 2009-06-16 16:30:42 -04:00
parent f209d6792d
commit 3528eef655
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/genericDisplay.js
View File

@ -22,7 +22,7 @@ ITEM_DISPLAY_DESCRIPTION_COLOR.from_pixel(0xffffffbb);
const ITEM_DISPLAY_BACKGROUND_COLOR = new Clutter.Color(); const ITEM_DISPLAY_BACKGROUND_COLOR = new Clutter.Color();
ITEM_DISPLAY_BACKGROUND_COLOR.from_pixel(0x00000000); ITEM_DISPLAY_BACKGROUND_COLOR.from_pixel(0x00000000);
const ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR = new Clutter.Color(); const ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR = new Clutter.Color();
ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR.from_pixel(0x00ff0055); ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR.from_pixel(0x4f6fadaa);
const DISPLAY_CONTROL_SELECTED_COLOR = new Clutter.Color(); const DISPLAY_CONTROL_SELECTED_COLOR = new Clutter.Color();
DISPLAY_CONTROL_SELECTED_COLOR.from_pixel(0x112288ff); DISPLAY_CONTROL_SELECTED_COLOR.from_pixel(0x112288ff);
const PREVIEW_BOX_BACKGROUND_COLOR = new Clutter.Color(); const PREVIEW_BOX_BACKGROUND_COLOR = new Clutter.Color();

8
js/ui/overlay.js
View File

@ -364,6 +364,8 @@ Dash.prototype = {
// no item in the doc display has the selection. // no item in the doc display has the selection.
me._docDisplay.unsetSelected(); me._docDisplay.unsetSelected();
me._docDisplay.hidePreview(); me._docDisplay.hidePreview();
me._resultsDocDisplay.unsetSelected();
me._resultsDocDisplay.hidePreview();
}); });
this._docDisplay.connect('selected', function(docDisplay) { this._docDisplay.connect('selected', function(docDisplay) {
// We allow clicking on any item to select it, so if an // We allow clicking on any item to select it, so if an
@ -371,6 +373,8 @@ Dash.prototype = {
// no item in the app display has the selection. // no item in the app display has the selection.
me._appDisplay.unsetSelected(); me._appDisplay.unsetSelected();
me._appDisplay.hidePreview(); me._appDisplay.hidePreview();
me._resultsDocDisplay.unsetSelected();
me._resultsDocDisplay.hidePreview();
if (me._detailsPane.get_parent() == null) { if (me._detailsPane.get_parent() == null) {
me.actor.add_actor(me._detailsPane); me.actor.add_actor(me._detailsPane);
me.emit('panes-displayed'); me.emit('panes-displayed');
@ -379,6 +383,10 @@ Dash.prototype = {
me._detailsContent.append(me._docDisplay.selectedItemDetails, Big.BoxPackFlags.NONE); me._detailsContent.append(me._docDisplay.selectedItemDetails, Big.BoxPackFlags.NONE);
}); });
this._resultsDocDisplay.connect('selected', function(resultsDocDisplay) { this._resultsDocDisplay.connect('selected', function(resultsDocDisplay) {
me._appDisplay.unsetSelected();
me._appDisplay.hidePreview();
me._docDisplay.unsetSelected();
me._docDisplay.hidePreview();
if (me._detailsPane.get_parent() == null) { if (me._detailsPane.get_parent() == null) {
me.actor.add_actor(me._detailsPane); me.actor.add_actor(me._detailsPane);
me.emit('panes-displayed'); me.emit('panes-displayed');