brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
285a7467d0
gnome-shell/js/ui/viewSelector.js

594 lines
21 KiB
JavaScript
Raw Normal View History

*.js: Make emacs modelines consistent js2-mode is no longer developed and we recommend js-mode these days, so switch the modelines to specify that, and make them consistent across all files. https://bugzilla.gnome.org/show_bug.cgi?id=660358
2011-09-28 13:16:26 +00:00
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
const Clutter = imports.gi.Clutter;
dash: Open 'Show Apps' with Super+A This is a workaround for power users for the "Show Apps" button placement being too inconvenient to press at the bottom of the dash favorites list. Unity also uses Super+A to show the Apps lens. https://bugzilla.gnome.org/show_bug.cgi?id=685738
2012-10-08 16:16:55 +00:00
const Gio = imports.gi.Gio;
js: Use SOURCE_CONTINUE/SOURCE_REMOVE constants in source functions With support for boolean constants in g-i, we can finally use the more readable constants instead of true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 00:45:39 +00:00
const GLib = imports.gi.GLib;
viewSelector: add Applications pane and search entry to Ctrl-Alt-Tab Add Ctrl-Alt-Tab support to ViewTab, and fix the Applications pane to scroll to track the keyboard focus. The Windows pane can be switched to, but navigation within the pane is not yet implemented. https://bugzilla.gnome.org/show_bug.cgi?id=618887
2011-02-23 19:21:47 +00:00
const Gtk = imports.gi.Gtk;
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
const Mainloop = imports.mainloop;
const Meta = imports.gi.Meta;
const Signals = imports.signals;
const Lang = imports.lang;
const Shell = imports.gi.Shell;
const St = imports.gi.St;
viewSelector: Use a fixed set of view tabs Design calls for views being accessible by other means than the current tab system, so we have no longer a need for the public viewTab API. Move the initialization of tabs to the viewSelector and make viewSelector.addViewTab() private. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-07-28 20:06:46 +00:00
const AppDisplay = imports.ui.appDisplay;
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
const Main = imports.ui.main;
viewSelector: don't crossfade between pages Instead, wait until the first animation is completed before switching to the second page. https://bugzilla.gnome.org/show_bug.cgi?id=693924
2013-01-24 06:35:19 +00:00
const OverviewControls = imports.ui.overviewControls;
ViewSelector: use Params to pass optional parameters to addPage This allows to introduce new parameters without making the signature overly complex. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:20:46 +00:00
const Params = imports.misc.params;
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
const Search = imports.ui.search;
Add context menus to some entries Use ShellEntry.addContextMenu() to add context menus to most existing entries, with the exception of: - the login dialog - it may act be used to enter either the username (e.g. no password entry) or the password, and copy/paste does not make sense (nowhere to copy from, nowhere to paste to) - notifications - while adding a context menu is useful here as well, it will require changes to the tray's focus grab handling, so leave those entries out for now https://bugzilla.gnome.org/show_bug.cgi?id=659275
2011-10-11 22:38:24 +00:00
const ShellEntry = imports.ui.shellEntry;
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
const Tweener = imports.ui.tweener;
viewSelector: Use a fixed set of view tabs Design calls for views being accessible by other means than the current tab system, so we have no longer a need for the public viewTab API. Move the initialization of tabs to the viewSelector and make viewSelector.addViewTab() private. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-07-28 20:06:46 +00:00
const WorkspacesView = imports.ui.workspacesView;
viewSelector: Take edge drag gesture into a separate file This may not be solely used by this code, so take the gesture action code to its own separate file. https://bugzilla.gnome.org/show_bug.cgi?id=735625
2014-08-05 14:25:30 +00:00
const EdgeDragAction = imports.ui.edgeDragAction;
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
dash: Open 'Show Apps' with Super+A This is a workaround for power users for the "Show Apps" button placement being too inconvenient to press at the bottom of the dash favorites list. Unity also uses Super+A to show the Apps lens. https://bugzilla.gnome.org/show_bug.cgi?id=685738
2012-10-08 16:16:55 +00:00
const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
viewSelector: add a method to get the currently active page https://bugzilla.gnome.org/show_bug.cgi?id=682050
2013-02-13 21:13:14 +00:00
const ViewPage = {
WINDOWS: 1,
APPS: 2,
SEARCH: 3
};
viewSelector: Clean up focusTrap in search results Rather than relying on implementation details of StWidget's keyboard navigation to "hide" the focusTrap from arrow key navigation, implement the desired behavior explicitly in a custom widget. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-03-10 00:33:31 +00:00
const FocusTrap = new Lang.Class({
Name: 'FocusTrap',
Extends: St.Widget,
vfunc_navigate_focus: function(from, direction) {
if (direction == Gtk.DirectionType.TAB_FORWARD ||
direction == Gtk.DirectionType.TAB_BACKWARD)
return this.parent(from, direction);
return false;
}
});
viewSelector: Make sure not to start searching when we only have whitespace As this is thrown out before we actually query providers, we end up with a confusing screen that says "Searching..." that won't ever get results. https://bugzilla.gnome.org/show_bug.cgi?id=693458
2013-02-09 02:05:15 +00:00
function getTermsForSearchString(searchString) {
searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
if (searchString == '')
return [];
let terms = searchString.split(/\s+/);
return terms;
}
viewSelector: Clean up focusTrap in search results Rather than relying on implementation details of StWidget's keyboard navigation to "hide" the focusTrap from arrow key navigation, implement the desired behavior explicitly in a custom widget. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-03-10 00:33:31 +00:00
viewSelector: Show the overview on 3-finger pinch gestures
2014-06-25 16:12:04 +00:00
const ShowOverviewAction = new Lang.Class({
Name: 'ShowOverviewAction',
Extends: Clutter.GestureAction,
_init : function() {
this.parent();
this.set_n_touch_points(3);
global.display.connect('grab-op-begin', Lang.bind(this, function() {
this.cancel();
}));
},
vfunc_gesture_prepare : function(action, actor) {
return this.get_n_current_points() == this.get_n_touch_points();
},
_getBoundingRect : function(motion) {
let minX, minY, maxX, maxY;
for (let i = 0; i < this.get_n_current_points(); i++) {
let x, y;
if (motion == true) {
[x, y] = this.get_motion_coords(i);
} else {
[x, y] = this.get_press_coords(i);
}
if (i == 0) {
minX = maxX = x;
minY = maxY = y;
} else {
minX = Math.min(minX, x);
minY = Math.min(minY, y);
maxX = Math.max(maxX, x);
maxY = Math.max(maxY, y);
}
}
return new Meta.Rectangle({ x: minX,
y: minY,
width: maxX - minX,
height: maxY - minY });
},
vfunc_gesture_begin : function(action, actor) {
this._initialRect = this._getBoundingRect(false);
return true;
},
vfunc_gesture_end : function(action, actor) {
let rect = this._getBoundingRect(true);
let oldArea = this._initialRect.width * this._initialRect.height;
let newArea = rect.width * rect.height;
let areaDiff = newArea / oldArea;
this.emit('activated', areaDiff);
}
});
Signals.addSignalMethods(ShowOverviewAction.prototype);
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
const ViewSelector = new Lang.Class({
Name: 'ViewSelector',
_init : function(searchEntry, showAppsButton) {
ViewSelector: remove unnecessary StBoxLayout It was a remnant from the tabbed interface. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:21:53 +00:00
this.actor = new Shell.Stack({ name: 'viewSelector' });
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._showAppsButton = showAppsButton;
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._showAppsButton.connect('notify::checked', Lang.bind(this, this._onShowAppsButtonToggled));
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._activePage = null;
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
this._searchActive = false;
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
this._searchTimeoutId = 0;
overview: Move the entry out of the SearchTab into the overview The entry should be positioned in the center of the overview. This makes that its position can’t be set in the viewSelector without making things overly complicated. Therefore we move the entry to the overview. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-07-28 20:47:55 +00:00
this._entry = searchEntry;
Add context menus to some entries Use ShellEntry.addContextMenu() to add context menus to most existing entries, with the exception of: - the login dialog - it may act be used to enter either the username (e.g. no password entry) or the password, and copy/paste does not make sense (nowhere to copy from, nowhere to paste to) - notifications - while adding a context menu is useful here as well, it will require changes to the tray's focus grab handling, so leave those entries out for now https://bugzilla.gnome.org/show_bug.cgi?id=659275
2011-10-11 22:38:24 +00:00
ShellEntry.addContextMenu(this._entry);
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
this._text = this._entry.clutter_text;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._text.connect('text-changed', Lang.bind(this, this._onTextChanged));
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
this._text.connect('key-press-event', Lang.bind(this, this._onKeyPress));
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._text.connect('key-focus-in', Lang.bind(this, function() {
this._searchResults.highlightDefault(true);
}));
this._text.connect('key-focus-out', Lang.bind(this, function() {
this._searchResults.highlightDefault(false);
}));
this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped));
global.stage.connect('notify::key-focus', Lang.bind(this, this._onStageKeyFocusChanged));
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
viewSelector: Move the loupe icon to the primary slot This matches the behavior in GTK+. See the rationale there. https://bugzilla.gnome.org/show_bug.cgi?id=695069
2013-03-03 18:56:12 +00:00
this._entry.set_primary_icon(new St.Icon({ style_class: 'search-entry-icon',
icon_name: 'edit-find-symbolic' }));
Make the search entry behave better in RTL locales It is expected that the primary and secondary icons in entries change places in RTL locales. When doing so, the edit-clear icon must be replaced by an rtl variant too. http://bugzilla.gnome.org/show_bug.cgi?id=705779
2013-08-26 22:24:26 +00:00
if (this._entry.get_text_direction() == Clutter.TextDirection.RTL)
this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
Use the new RTL icons from adwaita Use the suffix -rtl and -ltr. https://bugzilla.gnome.org/show_bug.cgi?id=732301
2014-06-26 22:25:22 +00:00
icon_name: 'edit-clear-symbolic-rtl' });
Make the search entry behave better in RTL locales It is expected that the primary and secondary icons in entries change places in RTL locales. When doing so, the edit-clear icon must be replaced by an rtl variant too. http://bugzilla.gnome.org/show_bug.cgi?id=705779
2013-08-26 22:24:26 +00:00
else
this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
Use the new RTL icons from adwaita Use the suffix -rtl and -ltr. https://bugzilla.gnome.org/show_bug.cgi?id=732301
2014-06-26 22:25:22 +00:00
icon_name: 'edit-clear-symbolic-ltr' });
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
this._iconClickedId = 0;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._capturedEventId = 0;
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
ViewSelector: use Params to pass optional parameters to addPage This allows to introduce new parameters without making the signature overly complex. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:20:46 +00:00
this._workspacesPage = this._addPage(this._workspacesDisplay.actor,
ctrl-alt-tab: use better icons The top panel and message tray icons were by default a gnome foot and are replaced by better ones. The applications icon is now using the symbolic apps icon of the dash, and the windows icon is also improved. https://bugzilla.gnome.org/show_bug.cgi?id=641303
2012-11-20 10:51:56 +00:00
_("Windows"), 'emblem-documents-symbolic');
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
Add a FocusApp method to org.gnome.Shell This method, which accepts a .desktop filename, is used to highlight a specific application in the overview, for example because it has just been created or installed. https://bugzilla.gnome.org/show_bug.cgi?id=654086
2011-07-09 13:30:42 +00:00
this.appDisplay = new AppDisplay.AppDisplay();
this._appsPage = this._addPage(this.appDisplay.actor,
ctrl-alt-tab: use better icons The top panel and message tray icons were by default a gnome foot and are replaced by better ones. The applications icon is now using the symbolic apps icon of the dash, and the windows icon is also improved. https://bugzilla.gnome.org/show_bug.cgi?id=641303
2012-11-20 10:51:56 +00:00
_("Applications"), 'view-grid-symbolic');
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
viewSelector: Move all of the provider-loading logic to SearchSystem The existing provider system is split between a confusing mess of RemoteSearch, SearchSystem, SearchDisplay, and ViewSelector, partly because of the vestigal in-shell search system. Move most of the logic to search.js so it's easier to read.
2013-10-30 16:38:46 +00:00
this._searchResults = new Search.SearchResults();
ViewSelector: use Params to pass optional parameters to addPage This allows to introduce new parameters without making the signature overly complex. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:20:46 +00:00
this._searchPage = this._addPage(this._searchResults.actor,
_("Search"), 'edit-find-symbolic',
{ a11yFocus: this._entry });
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
searchDisplay, viewSelector: use St keynav in Applications and Search https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-12 04:40:56 +00:00
// Since the entry isn't inside the results container we install this
// dummy widget as the last results container child so that we can
viewSelector: Clean up focusTrap in search results Rather than relying on implementation details of StWidget's keyboard navigation to "hide" the focusTrap from arrow key navigation, implement the desired behavior explicitly in a custom widget. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-03-10 00:33:31 +00:00
// include the entry in the keynav tab path
this._focusTrap = new FocusTrap({ can_focus: true });
searchDisplay, viewSelector: use St keynav in Applications and Search https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-12 04:40:56 +00:00
this._focusTrap.connect('key-focus-in', Lang.bind(this, function() {
this._entry.grab_key_focus();
}));
this._searchResults.actor.add_actor(this._focusTrap);
global.focus_manager.add_group(this._searchResults.actor);
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._stageKeyPressId = 0;
Main.overview.connect('showing', Lang.bind(this,
function () {
this._stageKeyPressId = global.stage.connect('key-press-event',
Lang.bind(this, this._onStageKeyPress));
}));
Main.overview.connect('hiding', Lang.bind(this,
function () {
if (this._stageKeyPressId != 0) {
global.stage.disconnect(this._stageKeyPressId);
this._stageKeyPressId = 0;
}
}));
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
Main.overview.connect('shown', Lang.bind(this,
function() {
// If we were animating from the desktop view to the
// apps page the workspace page was visible, allowing
// the windows to animate, but now we no longer want to
// show it given that we are now on the apps page or
// search page.
if (this._activePage != this._workspacesPage)
this._workspacesPage.opacity = 0;
}));
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
viewSelector: Make toggle-application-view binding available in overview https://bugzilla.gnome.org/show_bug.cgi?id=688202
2012-08-16 12:46:23 +00:00
Main.wm.addKeybinding('toggle-application-view',
js: Adapt to GSettings API change The 'schema' property has been deprecated for a long time. Even though this will likely be reverted in glib, let's stop using it.
2014-06-24 19:17:09 +00:00
new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
viewSelector: Make toggle-application-view binding available in overview https://bugzilla.gnome.org/show_bug.cgi?id=688202
2012-08-16 12:46:23 +00:00
Meta.KeyBindingFlags.NONE,
main: Move KeybindingMode into Shell Having the definition in C instead of Javascript allows sharing the corresponding header with gnome-settings-daemon. https://bugzilla.gnome.org/show_bug.cgi?id=643111
2012-12-12 13:14:13 +00:00
Shell.KeyBindingMode.NORMAL |
Shell.KeyBindingMode.OVERVIEW,
viewSelector: Make toggle-application-view binding available in overview https://bugzilla.gnome.org/show_bug.cgi?id=688202
2012-08-16 12:46:23 +00:00
Lang.bind(this, this._toggleAppsPage));
Add a toggle-overview keybinding This is a new, regular keybinding for going to the overview. The default binding is Super-S, which goes well with Super-A for going to the application grid. This is separate from the existing panel-main-menu keybinding, so that we can keep Alt-F1 opening the main menu in classic mode. https://bugzilla.gnome.org/show_bug.cgi?id=698251
2013-04-17 23:26:06 +00:00
Main.wm.addKeybinding('toggle-overview',
js: Adapt to GSettings API change The 'schema' property has been deprecated for a long time. Even though this will likely be reverted in glib, let's stop using it.
2014-06-24 19:17:09 +00:00
new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
Add a toggle-overview keybinding This is a new, regular keybinding for going to the overview. The default binding is Super-S, which goes well with Super-A for going to the application grid. This is separate from the existing panel-main-menu keybinding, so that we can keep Alt-F1 opening the main menu in classic mode. https://bugzilla.gnome.org/show_bug.cgi?id=698251
2013-04-17 23:26:06 +00:00
Meta.KeyBindingFlags.NONE,
Shell.KeyBindingMode.NORMAL |
Shell.KeyBindingMode.OVERVIEW,
Lang.bind(Main.overview, Main.overview.toggle));
viewSelector: Show the overview on 3-finger pinch gestures
2014-06-25 16:12:04 +00:00
let gesture;
viewSelector: Take edge drag gesture into a separate file This may not be solely used by this code, so take the gesture action code to its own separate file. https://bugzilla.gnome.org/show_bug.cgi?id=735625
2014-08-05 14:25:30 +00:00
gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
viewSelector: Add left edge drag gesture to show the app picker
2014-06-25 15:52:19 +00:00
gesture.connect('activated', Lang.bind(this, function() {
if (Main.overview.visible)
Main.overview.hide();
else
this.showApps();
}));
global.stage.add_action(gesture);
viewSelector: Show the overview on 3-finger pinch gestures
2014-06-25 16:12:04 +00:00
gesture = new ShowOverviewAction();
gesture.connect('activated', Lang.bind(this, function(action, areaDiff) {
if (areaDiff < 0.7)
Main.overview.show();
}));
global.stage.add_action(gesture);
dash: Open 'Show Apps' with Super+A This is a workaround for power users for the "Show Apps" button placement being too inconvenient to press at the bottom of the dash favorites list. Unity also uses Super+A to show the Apps lens. https://bugzilla.gnome.org/show_bug.cgi?id=685738
2012-10-08 16:16:55 +00:00
},
viewSelector: Make toggle-application-view binding available in overview https://bugzilla.gnome.org/show_bug.cgi?id=688202
2012-08-16 12:46:23 +00:00
_toggleAppsPage: function() {
this._showAppsButton.checked = !this._showAppsButton.checked;
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
Main.overview.show();
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
},
ShellDBus: add ShowApplications method Add a method to control the visibility of the applications view. This can used by gnome-settings-daemon for special keys in certain keyboards. https://bugzilla.gnome.org/show_bug.cgi?id=698743
2013-04-24 17:32:41 +00:00
showApps: function() {
this._showAppsButton.checked = true;
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
Main.overview.show();
ShellDBus: add ShowApplications method Add a method to control the visibility of the applications view. This can used by gnome-settings-daemon for special keys in certain keyboards. https://bugzilla.gnome.org/show_bug.cgi?id=698743
2013-04-24 17:32:41 +00:00
},
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
show: function() {
viewSelector: always reset search string when entering overview Instead of relying on the apps button callback to do it for us. https://bugzilla.gnome.org/show_bug.cgi?id=693974
2013-02-16 17:54:19 +00:00
this.reset();
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
this._workspacesDisplay.show(this._showAppsButton.checked);
viewSelector: Don't show pages until they need to be visible AppDisplay queues a deferred work to load frequently used apps when the apps page is loaded. Unfortunately, when the overview is first opened, all the pages start out visible and then immediately get hidden, so the deferred work runs immediately after the first overview opening, whether the user was going to view their frequent apps or not. Start all pages off as hidden, and rearrange the code so that pages are only shown when they really need to be. https://bugzilla.gnome.org/show_bug.cgi?id=712753
2013-11-20 17:06:14 +00:00
this._activePage = null;
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
if (this._showAppsButton.checked)
this._showPage(this._appsPage);
else
this._showPage(this._workspacesPage);
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
Main.overview.fadeOutDesktop();
},
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
animateFromOverview: function() {
// Make sure workspace page is fully visible to allow
// workspace.js do the animation of the windows
this._workspacesPage.opacity = 255;
this._workspacesDisplay.animateFromOverview(this._activePage != this._workspacesPage);
viewSelector: Remove duplicate call to showPage We were calling twice showPage() with the correct page, here and in show() / zoomFromOverview given that _resetShowAppsbutton was called from the signal 'showing' of overview. Given that the call to _resetShowAppsbutton is only actually used when hiding the overview we can actually put the checked state of the button to false when animating from overview so it shows the workspace page, causing the same behavior of _resetShowAppsbutton without all the shenanigans of resetting when the hiding overview signal is triggered. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 16:55:34 +00:00
this._showAppsButton.checked = false;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
Main.overview.fadeInDesktop();
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
},
workspace: Make room for a second geometry to keep track of As we want to eventually track two geometries, we need to rename our very plain "_x, _y, _width, _height". While we could just prefix them, I think that stuffing them in an object makes more sense. At the same time, make the variable and method name more descriptive by adding such a prefix, as well as a bit of documentation. https://bugzilla.gnome.org/show_bug.cgi?id=694469
2013-02-25 23:25:27 +00:00
setWorkspacesFullGeometry: function(geom) {
this._workspacesDisplay.setWorkspacesFullGeometry(geom);
workspacesView: Calculate the workspaces geometry ourselves To ensure that we don't recalculate window layouts when zooming in or out, we need to always pass the full geometry. This will break window repositioning when we zoom back in; for the purposes of commit clarity, this breaks this feature for now. It will be added back soon. https://bugzilla.gnome.org/show_bug.cgi?id=694469
2013-02-25 23:11:59 +00:00
},
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
hide: function() {
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._workspacesDisplay.hide();
},
ViewSelector: use Params to pass optional parameters to addPage This allows to introduce new parameters without making the signature overly complex. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:20:46 +00:00
_addPage: function(actor, name, a11yIcon, params) {
params = Params.parse(params, { a11yFocus: null });
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
let page = new St.Bin({ child: actor,
x_align: St.Align.START,
y_align: St.Align.START,
x_fill: true,
y_fill: true });
ViewSelector: use Params to pass optional parameters to addPage This allows to introduce new parameters without making the signature overly complex. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:20:46 +00:00
if (params.a11yFocus)
Main.ctrlAltTabManager.addGroup(params.a11yFocus, name, a11yIcon);
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
else
Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon,
{ proxy: this.actor,
focusCallback: Lang.bind(this,
function() {
this._a11yFocusPage(page);
})
});;
viewSelector: Don't show pages until they need to be visible AppDisplay queues a deferred work to load frequently used apps when the apps page is loaded. Unfortunately, when the overview is first opened, all the pages start out visible and then immediately get hidden, so the deferred work runs immediately after the first overview opening, whether the user was going to view their frequent apps or not. Start all pages off as hidden, and rearrange the code so that pages are only shown when they really need to be. https://bugzilla.gnome.org/show_bug.cgi?id=712753
2013-11-20 17:06:14 +00:00
page.hide();
ViewSelector: remove unnecessary StBoxLayout It was a remnant from the tabbed interface. https://bugzilla.gnome.org/show_bug.cgi?id=690171
2012-12-13 22:21:53 +00:00
this.actor.add_actor(page);
view-selector: add missing semicolon https://bugzilla.gnome.org/show_bug.cgi?id=687491
2012-11-01 13:45:04 +00:00
return page;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
},
viewSelector: make the old page fade-out optional When leaving the overview, we don't want the old page to fade out, but we want to fade in the windows directly. https://bugzilla.gnome.org/show_bug.cgi?id=693974
2013-02-16 17:59:54 +00:00
_fadePageIn: function(oldPage) {
if (oldPage)
oldPage.hide();
viewSelector: emit a signal when the view is empty This is very a useful point in time when the size of the side controls can change without affecting any visible view. Emit a signal at that time. https://bugzilla.gnome.org/show_bug.cgi?id=693924
2013-02-16 01:43:45 +00:00
this.emit('page-empty');
Revert "viewSelector: Give the active page key focus when it is shown" This broke keyboard navigation in the app picker, which is not an acceptable regression for the release. This reverts commit ec2bb039ae7ab3f3504bfe0fdba6c715f5a838fd.
2014-02-19 00:44:58 +00:00
viewSelector: don't crossfade between pages Instead, wait until the first animation is completed before switching to the second page. https://bugzilla.gnome.org/show_bug.cgi?id=693924
2013-01-24 06:35:19 +00:00
this._activePage.show();
Tweener.addTween(this._activePage,
{ opacity: 255,
overviewControls: synchronize viewSelector fade and controls slide If the animation time is not the same for these two, the translation will be adjusted to the allocation during the tween, resulting in a jump in the animation. https://bugzilla.gnome.org/show_bug.cgi?id=694035
2013-02-18 05:17:56 +00:00
time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
viewSelector: don't crossfade between pages Instead, wait until the first animation is completed before switching to the second page. https://bugzilla.gnome.org/show_bug.cgi?id=693924
2013-01-24 06:35:19 +00:00
transition: 'easeOutQuad'
});
},
viewSelector: Remove duplicate call to showPage We were calling twice showPage() with the correct page, here and in show() / zoomFromOverview given that _resetShowAppsbutton was called from the signal 'showing' of overview. Given that the call to _resetShowAppsbutton is only actually used when hiding the overview we can actually put the checked state of the button to false when animating from overview so it shows the workspace page, causing the same behavior of _resetShowAppsbutton without all the shenanigans of resetting when the hiding overview signal is triggered. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 16:55:34 +00:00
_showPage: function(page) {
workspace: Fade in instead of zoom to return desktop The zooming animation of the windows looks nice when animating from the workspace display page, but looks weird from other pages like apps page or search page since the windows come from nowhere with an initial position not known to the user. Instead of that just fade the desktop with the windows in its original position. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 17:06:08 +00:00
if (!Main.overview.visible)
return;
viewSelector: notify on active page changes In order to do this, we also need to move the assignment of this._activePage from the animation onComplete callback to the function itself. https://bugzilla.gnome.org/show_bug.cgi?id=682050
2013-01-24 21:35:11 +00:00
if (page == this._activePage)
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
return;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
viewSelector: notify on active page changes In order to do this, we also need to move the assignment of this._activePage from the animation onComplete callback to the function itself. https://bugzilla.gnome.org/show_bug.cgi?id=682050
2013-01-24 21:35:11 +00:00
let oldPage = this._activePage;
viewSelector: don't crossfade between pages Instead, wait until the first animation is completed before switching to the second page. https://bugzilla.gnome.org/show_bug.cgi?id=693924
2013-01-24 06:35:19 +00:00
this._activePage = page;
this.emit('page-changed');
viewSelector: Remove duplicate call to showPage We were calling twice showPage() with the correct page, here and in show() / zoomFromOverview given that _resetShowAppsbutton was called from the signal 'showing' of overview. Given that the call to _resetShowAppsbutton is only actually used when hiding the overview we can actually put the checked state of the button to false when animating from overview so it shows the workspace page, causing the same behavior of _resetShowAppsbutton without all the shenanigans of resetting when the hiding overview signal is triggered. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 16:55:34 +00:00
if (oldPage)
viewSelector: notify on active page changes In order to do this, we also need to move the assignment of this._activePage from the animation onComplete callback to the function itself. https://bugzilla.gnome.org/show_bug.cgi?id=682050
2013-01-24 21:35:11 +00:00
Tweener.addTween(oldPage,
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
{ opacity: 0,
overviewControls: synchronize viewSelector fade and controls slide If the animation time is not the same for these two, the translation will be adjusted to the allocation during the tween, resulting in a jump in the animation. https://bugzilla.gnome.org/show_bug.cgi?id=694035
2013-02-18 05:17:56 +00:00
time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
transition: 'easeOutQuad',
onComplete: Lang.bind(this,
function() {
viewSelector: make the old page fade-out optional When leaving the overview, we don't want the old page to fade out, but we want to fade in the windows directly. https://bugzilla.gnome.org/show_bug.cgi?id=693974
2013-02-16 17:59:54 +00:00
this._fadePageIn(oldPage);
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
})
});
viewSelector: don't crossfade between pages Instead, wait until the first animation is completed before switching to the second page. https://bugzilla.gnome.org/show_bug.cgi?id=693924
2013-01-24 06:35:19 +00:00
else
viewSelector: Remove duplicate call to showPage We were calling twice showPage() with the correct page, here and in show() / zoomFromOverview given that _resetShowAppsbutton was called from the signal 'showing' of overview. Given that the call to _resetShowAppsbutton is only actually used when hiding the overview we can actually put the checked state of the button to false when animating from overview so it shows the workspace page, causing the same behavior of _resetShowAppsbutton without all the shenanigans of resetting when the hiding overview signal is triggered. https://bugzilla.gnome.org/show_bug.cgi?id=732901
2014-07-14 16:55:34 +00:00
this._fadePageIn();
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
},
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
_a11yFocusPage: function(page) {
this._showAppsButton.checked = page == this._appsPage;
page.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
},
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
_onShowAppsButtonToggled: function() {
viewSelector: block show apps button checked signal when resetting state When we reset the state of the checked button due to the overview showing and hiding, block the normal checked callback and immediately switch to the workspaces page, so that windows seamlessly fade in. https://bugzilla.gnome.org/show_bug.cgi?id=693974
2013-02-16 17:55:59 +00:00
this._showPage(this._showAppsButton.checked ?
this._appsPage : this._workspacesPage);
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
},
_onStageKeyPress: function(actor, event) {
viewSelector: Ignore key-presses during non-overview modals Since commit 0c807bddaf4d, the run dialog no longer handles Escape key presses itself but uses the action key mechanism of modal dialogs. As the latter uses key-release events, our own handling of the Escape key runs on key-press. Fix this by bailing out early if anything has pushed a modal in addition to the overview (like system modals, looking glass, ...). https://bugzilla.gnome.org/show_bug.cgi?id=688196
2012-11-12 17:41:14 +00:00
// Ignore events while anything but the overview has
// pushed a modal (system modals, looking glass, ...)
if (Main.modalCount > 1)
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_PROPAGATE;
viewSelector: Ignore key-presses during non-overview modals Since commit 0c807bddaf4d, the run dialog no longer handles Escape key presses itself but uses the action key mechanism of modal dialogs. As the latter uses key-release events, our own handling of the Escape key runs on key-press. Fix this by bailing out early if anything has pushed a modal in addition to the overview (like system modals, looking glass, ...). https://bugzilla.gnome.org/show_bug.cgi?id=688196
2012-11-12 17:41:14 +00:00
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
let modifiers = event.get_state();
let symbol = event.get_key_symbol();
if (symbol == Clutter.Escape) {
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
if (this._searchActive)
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this.reset();
viewSelector: Allow to close the application view with escape With the latest changes to the overview, the application view is now clearly on a different level compared to the window picker. For that reason it now makes sense to close it on Escape rather than hiding the overview directly, as we do for search. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-08-15 10:20:24 +00:00
else if (this._showAppsButton.checked)
viewSelector: don't use resetShowAppsButton when pressing escape Set the checked property explicitly. This is because resetShowAppsButton() will only be used to flip the button state blocking the page change in a future commit. https://bugzilla.gnome.org/show_bug.cgi?id=693974
2013-02-16 17:50:25 +00:00
this._showAppsButton.checked = false;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
else
Main.overview.hide();
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
viewSelector: Don't focus search entry on whitespace We recently started to trim leading and trailing whitespace from the search string, and not to trigger a search when the resulting string was empty. However we still allow whitespace to trigger type-ahead-find, so that the key focus is moved briefly to the search entry and back to the stage, resulting in a disruptive flickering of the entry. Fix this by excluding whitespace from triggering type-ahead-find. https://bugzilla.gnome.org/show_bug.cgi?id=694475
2013-02-22 19:56:24 +00:00
} else if (this._shouldTriggerSearch(symbol)) {
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this.startSearch(event);
viewSelector: Don't re-navigate into the active page Starting keynav into the active page is handled from a key-press handler on the stage, however we should not "start" keynav when we are already navigating elsewhere - the latter can happen when keynav fails (for instance because the focus is trapped inside an open app folder or at the end of the dash), and the event bubbles up to the stage. So make sure to only handle the event to actually start keynav, to not interfere with the normal navigation handling. Thanks to Carlos Soriano <carlos.soriano89@gmail.com> for the debugging footwork. https://bugzilla.gnome.org/show_bug.cgi?id=726760
2014-05-23 15:14:20 +00:00
} else if (!this._searchActive && !global.stage.key_focus) {
Revert "viewSelector: Give the active page key focus when it is shown" This broke keyboard navigation in the app picker, which is not an acceptable regression for the release. This reverts commit ec2bb039ae7ab3f3504bfe0fdba6c715f5a838fd.
2014-02-19 00:44:58 +00:00
if (symbol == Clutter.Tab || symbol == Clutter.Down) {
this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
viewSelector: Use clutter constant instead of true
2014-06-10 18:25:16 +00:00
return Clutter.EVENT_STOP;
Revert "viewSelector: Give the active page key focus when it is shown" This broke keyboard navigation in the app picker, which is not an acceptable regression for the release. This reverts commit ec2bb039ae7ab3f3504bfe0fdba6c715f5a838fd.
2014-02-19 00:44:58 +00:00
} else if (symbol == Clutter.ISO_Left_Tab) {
this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_BACKWARD, false);
viewSelector: Use clutter constant instead of true
2014-06-10 18:25:16 +00:00
return Clutter.EVENT_STOP;
Revert "viewSelector: Give the active page key focus when it is shown" This broke keyboard navigation in the app picker, which is not an acceptable regression for the release. This reverts commit ec2bb039ae7ab3f3504bfe0fdba6c715f5a838fd.
2014-02-19 00:44:58 +00:00
}
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
}
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_PROPAGATE;
viewSelector: Merge SearchTab into the ViewSelector Tabs used to provide an abstraction for a page and the control used to activate it. As the latter has now been replaced with external controls handled directly in the viewSelector, the abstraction itself doesn't make much sense anymore. In preparation of replacing it, move the search handling provided by the SearchTab directly in the viewSelector. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
},
_searchCancelled: function() {
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._showPage(this._showAppsButton.checked ? this._appsPage
: this._workspacesPage);
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
Fix search handling when typing multiple searches in the search box In the current implementation of the search entry, when replacing a selected search term with another term, the first character of the replacement is prepended to the hint text rather than starting a new search. This fix makes sure that the focus is not lost when changing the selected search term. https://bugzilla.gnome.org/show_bug.cgi?id=636341
2011-04-07 23:10:24 +00:00
// Leave the entry focused when it doesn't have any text;
// when replacing a selected search term, Clutter emits
// two 'text-changed' signals, one for deleting the previous
// text and one for the new one - the second one is handled
// incorrectly when we remove focus
// (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
if (this._text.text != '')
viewSelector: Make the search canceling behavior consistent When canceling a search pressing Escape while the focus is on the search entry we clear the entry, set its text to the hint and go back to the previously selected tab. Make this the behavior also for when the focus is on search results and not on the entry itself. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 14:17:33 +00:00
this.reset();
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
},
viewSelector: Make the search canceling behavior consistent When canceling a search pressing Escape while the focus is on the search entry we clear the entry, set its text to the hint and go back to the previously selected tab. Make this the behavior also for when the focus is on search results and not on the entry itself. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 14:17:33 +00:00
reset: function () {
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
global.stage.set_key_focus(null);
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
viewSelector: Make the search canceling behavior consistent When canceling a search pressing Escape while the focus is on the search entry we clear the entry, set its text to the hint and go back to the previously selected tab. Make this the behavior also for when the focus is on search results and not on the entry itself. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 14:17:33 +00:00
this._entry.text = '';
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
this._text.set_cursor_visible(true);
this._text.set_selection(0, 0);
},
viewSelector: While on search results keep the entry styled as focused This hints the user that even though keynav focus is on the search results, if there's character input it will update the search string. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 17:43:59 +00:00
_onStageKeyFocusChanged: function() {
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
let focus = global.stage.get_key_focus();
viewSelector: Tie cursor visibility to :focus style With the recent keynav changes, the keyboard focus can now move away from the search entry while a search is active. While we keep the focus entry style while a search is active, we set the cursor visibility depending on whether the entry has focus. This doesn't seem very logical, so always request to show the cursor when we appear focused. Note that at least for now we are just expressing intent, as clutter never draws the cursor for unfocused entries.
2012-03-10 04:50:17 +00:00
let appearFocused = (this._entry.contains(focus) ||
this._searchResults.actor.contains(focus));
viewSelector: While on search results keep the entry styled as focused This hints the user that even though keynav focus is on the search results, if there's character input it will update the search string. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 17:43:59 +00:00
viewSelector: Tie cursor visibility to :focus style With the recent keynav changes, the keyboard focus can now move away from the search entry while a search is active. While we keep the focus entry style while a search is active, we set the cursor visibility depending on whether the entry has focus. This doesn't seem very logical, so always request to show the cursor when we appear focused. Note that at least for now we are just expressing intent, as clutter never draws the cursor for unfocused entries.
2012-03-10 04:50:17 +00:00
this._text.set_cursor_visible(appearFocused);
if (appearFocused)
this._entry.add_style_pseudo_class('focus');
else
this._entry.remove_style_pseudo_class('focus');
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
},
_onMapped: function() {
if (this._entry.mapped) {
// Enable 'find-as-you-type'
this._capturedEventId = global.stage.connect('captured-event',
Lang.bind(this, this._onCapturedEvent));
this._text.set_cursor_visible(true);
this._text.set_selection(0, 0);
} else {
// Disable 'find-as-you-type'
if (this._capturedEventId > 0)
global.stage.disconnect(this._capturedEventId);
this._capturedEventId = 0;
}
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
},
viewSelector: Don't focus search entry on whitespace We recently started to trim leading and trailing whitespace from the search string, and not to trigger a search when the resulting string was empty. However we still allow whitespace to trigger type-ahead-find, so that the key focus is moved briefly to the search entry and back to the stage, resulting in a disruptive flickering of the entry. Fix this by excluding whitespace from triggering type-ahead-find. https://bugzilla.gnome.org/show_bug.cgi?id=694475
2013-02-22 19:56:24 +00:00
_shouldTriggerSearch: function(symbol) {
let unicode = Clutter.keysym_to_unicode(symbol);
if (unicode == 0)
return false;
if (getTermsForSearchString(String.fromCharCode(unicode)).length > 0)
return true;
return symbol == Clutter.BackSpace && this._searchActive;
},
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
startSearch: function(event) {
global.stage.set_key_focus(this._text);
viewSelector: Synthesize a new event with correct source for search We currently replay events that should start a search to the search entry, which is fairly dodgy. Synthesize a new event with the correct source actor instead, which is a bit less evil.
2014-07-09 10:06:40 +00:00
let synthEvent = event.copy();
synthEvent.set_source(this._text);
this._text.event(synthEvent, true);
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
},
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
// the entry does not show the hint
_isActivated: function() {
return this._text.text == this._entry.get_text();
},
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
_onTextChanged: function (se, prop) {
viewSelector: Make sure not to start searching when we only have whitespace As this is thrown out before we actually query providers, we end up with a confusing screen that says "Searching..." that won't ever get results. https://bugzilla.gnome.org/show_bug.cgi?id=693458
2013-02-09 02:05:15 +00:00
let terms = getTermsForSearchString(this._entry.get_text());
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
let searchPreviouslyActive = this._searchActive;
viewSelector: Make sure not to start searching when we only have whitespace As this is thrown out before we actually query providers, we end up with a confusing screen that says "Searching..." that won't ever get results. https://bugzilla.gnome.org/show_bug.cgi?id=693458
2013-02-09 02:05:15 +00:00
this._searchActive = (terms.length > 0);
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
let startSearch = this._searchActive && !searchPreviouslyActive;
if (startSearch)
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
this._searchResults.startingSearch();
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
if (this._searchActive) {
viewSelector: Move the loupe icon to the primary slot This matches the behavior in GTK+. See the rationale there. https://bugzilla.gnome.org/show_bug.cgi?id=695069
2013-03-03 18:56:12 +00:00
this._entry.set_secondary_icon(this._clearIcon);
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
if (this._iconClickedId == 0)
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
this._iconClickedId = this._entry.connect('secondary-icon-clicked',
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
Lang.bind(this, this.reset));
js: Name all the timeouts and idles With very uninventive names. Names now, good names later. https://bugzilla.gnome.org/show_bug.cgi?id=727983
2014-04-10 17:26:52 +00:00
if (this._searchTimeoutId == 0) {
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
this._searchTimeoutId = Mainloop.timeout_add(150,
Lang.bind(this, this._doSearch));
js: Name all the timeouts and idles With very uninventive names. Names now, good names later. https://bugzilla.gnome.org/show_bug.cgi?id=727983
2014-04-10 17:26:52 +00:00
GLib.Source.set_name_by_id(this._searchTimeoutId, '[gnome-shell] this._doSearch');
}
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
} else {
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
if (this._iconClickedId > 0) {
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
this._entry.disconnect(this._iconClickedId);
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
this._iconClickedId = 0;
}
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
if (this._searchTimeoutId > 0) {
Mainloop.source_remove(this._searchTimeoutId);
this._searchTimeoutId = 0;
}
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
viewSelector: Move the loupe icon to the primary slot This matches the behavior in GTK+. See the rationale there. https://bugzilla.gnome.org/show_bug.cgi?id=695069
2013-03-03 18:56:12 +00:00
this._entry.set_secondary_icon(null);
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
this._searchCancelled();
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
}
},
Use more actor.grab_key_focus() and less stage.connect('key-press-event') Until recently, the clutter keyboard focus was almost always kept on the stage, and bits of code that wanted to do stuff with the keyboard would just watch for key-press-events on the stage. In several places, the code wasn't even bothering to ensure that the focus was on the stage, which caused problems with other actors that explicitly grabbed focus. A previous fix for this (f21403fd) was to always reset the focus to the stage after calling pushModal(), but a better fix is to just actually make use of the keyboard focus everywhere rather than having everyone try to read events off the stage. Now pushModal(actor) also does actor.grab_key_focus(), and various bits of code have been changed to read key events off their own toplevels rather than off the stage, meaning there's no chance of them accidentally getting someone else's events. https://bugzilla.gnome.org/show_bug.cgi?id=618885
2010-11-03 17:30:08 +00:00
_onKeyPress: function(entry, event) {
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
let symbol = event.get_key_symbol();
searchDisplay, viewSelector: add default result activation Adds a way to highlight and activate the first search result when pressing enter on the search entry. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-14 03:13:26 +00:00
if (symbol == Clutter.Escape) {
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
if (this._isActivated()) {
viewSelector: Make the search canceling behavior consistent When canceling a search pressing Escape while the focus is on the search entry we clear the entry, set its text to the hint and go back to the previously selected tab. Make this the behavior also for when the focus is on search results and not on the entry itself. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 14:17:33 +00:00
this.reset();
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
}
viewSelector: clean up active search state code 'active' isn't terribly clear about just what is active; also, make it private, remove an useless extra object state we were saving, and refactor some messy code. Based on a patch by Tanner Doshier. https://bugzilla.gnome.org/show_bug.cgi?id=692454
2012-08-24 16:24:49 +00:00
} else if (this._searchActive) {
viewSelector: Allow to start navigating results using arrow keys We currently require users to tab away from the search entry before search results can be navigated using arrow keys. For convenience, support using arrow keys directly from the entry. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-03-10 02:40:46 +00:00
let arrowNext, nextDirection;
if (entry.get_text_direction() == Clutter.TextDirection.RTL) {
arrowNext = Clutter.Left;
nextDirection = Gtk.DirectionType.LEFT;
} else {
arrowNext = Clutter.Right;
nextDirection = Gtk.DirectionType.RIGHT;
}
searchDisplay, viewSelector: use St keynav in Applications and Search https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-12 04:40:56 +00:00
if (symbol == Clutter.Tab) {
searchDisplay, viewSelector: add default result activation Adds a way to highlight and activate the first search result when pressing enter on the search entry. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-14 03:13:26 +00:00
this._searchResults.navigateFocus(Gtk.DirectionType.TAB_FORWARD);
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
searchDisplay, viewSelector: use St keynav in Applications and Search https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-12 04:40:56 +00:00
} else if (symbol == Clutter.ISO_Left_Tab) {
this._focusTrap.can_focus = false;
searchDisplay, viewSelector: add default result activation Adds a way to highlight and activate the first search result when pressing enter on the search entry. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-14 03:13:26 +00:00
this._searchResults.navigateFocus(Gtk.DirectionType.TAB_BACKWARD);
searchDisplay, viewSelector: use St keynav in Applications and Search https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-12 04:40:56 +00:00
this._focusTrap.can_focus = true;
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
viewSelector: Allow to start navigating results using arrow keys We currently require users to tab away from the search entry before search results can be navigated using arrow keys. For convenience, support using arrow keys directly from the entry. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-03-10 02:40:46 +00:00
} else if (symbol == Clutter.Down) {
this._searchResults.navigateFocus(Gtk.DirectionType.DOWN);
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
viewSelector: Allow to start navigating results using arrow keys We currently require users to tab away from the search entry before search results can be navigated using arrow keys. For convenience, support using arrow keys directly from the entry. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-03-10 02:40:46 +00:00
} else if (symbol == arrowNext && this._text.position == -1) {
this._searchResults.navigateFocus(nextDirection);
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
viewSelector: stop launching app from empty search In the overview, when there is no text in the search entry, this._searchActive will be set to false. Moving the Clutter.Return code block ensures that pressing enter in the search field after deleting the characters of a search will no longer launch the #1 application for the previous search. https://bugzilla.gnome.org/show_bug.cgi?id=692391
2013-01-27 19:00:59 +00:00
} else if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
// We can't connect to 'activate' here because search providers
// might want to do something with the modifiers in activateDefault.
if (this._searchTimeoutId > 0) {
Mainloop.source_remove(this._searchTimeoutId);
this._doSearch();
}
this._searchResults.activateDefault();
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_STOP;
searchDisplay, viewSelector: use St keynav in Applications and Search https://bugzilla.gnome.org/show_bug.cgi?id=663901
2011-11-12 04:40:56 +00:00
}
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
}
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_PROPAGATE;
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
},
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
_onCapturedEvent: function(actor, event) {
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
if (event.type() == Clutter.EventType.BUTTON_PRESS) {
let source = event.get_source();
search: fix keyboard hiding when user starts a new search The keyboard hides prematurely when the user is typing into an empty search box because the click is a captured event that triggers a loss of entry focus. By adding a keyboard check to this event, the problem is solved. https://bugzilla.gnome.org/show_bug.cgi?id=661340
2011-10-09 20:24:59 +00:00
if (source != this._text && this._text.text == '' &&
!Main.layoutManager.keyboardBox.contains(source)) {
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
// the user clicked outside after activating the entry, but
search: fix keyboard hiding when user starts a new search The keyboard hides prematurely when the user is typing into an empty search box because the click is a captured event that triggers a loss of entry focus. By adding a keyboard check to this event, the problem is solved. https://bugzilla.gnome.org/show_bug.cgi?id=661340
2011-10-09 20:24:59 +00:00
// with no search term entered and no keyboard button pressed
// - cancel the search
viewSelector: Make the search canceling behavior consistent When canceling a search pressing Escape while the focus is on the search entry we clear the entry, set its text to the hint and go back to the previously selected tab. Make this the behavior also for when the focus is on search results and not on the entry itself. https://bugzilla.gnome.org/show_bug.cgi?id=663901
2012-02-27 14:17:33 +00:00
this.reset();
viewSelector: don't process key presses from capture-event Rather than connecting to stage::capture-event and then trying to guess whether or not a given key-press should be handled by us or not, handle the end-search-on-Escape case from entry::key-press-event (since it only makes sense when the entry is focused anyway) and the start-search-on-printable-key case from stage::key-press-event (which will only get the events that no other actor wanted for itself). Similarly, do exit-overview-on-Escape and switch-panes cases from stage::key-press-event, rather than viewSelector.actor::key-press-event, so that they will work correctly even if the keyboard focus is somewhere else. (Also fix a longstanding bug in the pane-switching code, which was supposed to be disabled when a search was active, but was checking a non-existent variable.) https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:27:05 +00:00
}
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
}
viewSelector: remove the search entry's event grab The search entry was taking a sort of grab when it was in the focused-but-empty state, and would eat up most events for other actors (except, confusingly, for panel actors). The only bit of "modality" we really need here is that the entry is supposed to go back to the unfocused state if you click somewhere outside it when it was in the focused-but-empty state. So do that. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:44:03 +00:00
js: Use EVENT_PROPAGATE/EVENT_STOP constants in event handlers Just as SOURCE_CONTINUE/SOURCE_REMOVE in source functions, these constants increase code clarity over plain true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 18:17:34 +00:00
return Clutter.EVENT_PROPAGATE;
viewSelector: merge SearchEntry into SearchTab The division of labor between the two was quite muddled. Rather than try to invent a clean distinction of what belongs where, just merge them together. https://bugzilla.gnome.org/show_bug.cgi?id=642502
2011-02-16 18:20:03 +00:00
},
view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-18 12:51:47 +00:00
_doSearch: function () {
this._searchTimeoutId = 0;
viewSelector: Make sure not to start searching when we only have whitespace As this is thrown out before we actually query providers, we end up with a confusing screen that says "Searching..." that won't ever get results. https://bugzilla.gnome.org/show_bug.cgi?id=693458
2013-02-09 02:05:15 +00:00
let terms = getTermsForSearchString(this._entry.get_text());
viewSelector: Move all of the provider-loading logic to SearchSystem The existing provider system is split between a confusing mess of RemoteSearch, SearchSystem, SearchDisplay, and ViewSelector, partly because of the vestigal in-shell search system. Move most of the logic to search.js so it's easier to read.
2013-10-30 16:38:46 +00:00
this._searchResults.setTerms(terms);
viewSelector: Replace tab system with pages The old tab system is no longer a good fit for the current design, so replace most of the abstractions with a simpler page system. https://bugzilla.gnome.org/show_bug.cgi?id=682109
2012-06-21 22:52:56 +00:00
this._showPage(this._searchPage);
js: Use SOURCE_CONTINUE/SOURCE_REMOVE constants in source functions With support for boolean constants in g-i, we can finally use the more readable constants instead of true/false. https://bugzilla.gnome.org/show_bug.cgi?id=719567
2013-11-29 00:45:39 +00:00
return GLib.SOURCE_REMOVE;
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
},
viewSelector: add a method to get the currently active page https://bugzilla.gnome.org/show_bug.cgi?id=682050
2013-02-13 21:13:14 +00:00
getActivePage: function() {
if (this._activePage == this._workspacesPage)
return ViewPage.WINDOWS;
else if (this._activePage == this._appsPage)
return ViewPage.APPS;
else
return ViewPage.SEARCH;
overviewControls: fade view selector and thumbnails slider on DnD When an item is dragged from a page that is not the windows one, the only possible target is the dash, so fade out the rest. https://bugzilla.gnome.org/show_bug.cgi?id=686984
2013-02-18 04:45:24 +00:00
},
fadeIn: function() {
let actor = this._activePage;
Tweener.addTween(actor, { opacity: 255,
time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
transition: 'easeInQuad'
});
},
fadeHalf: function() {
let actor = this._activePage;
Tweener.addTween(actor, { opacity: 128,
time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
transition: 'easeOutQuad'
});
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
}
Port everything to class framework The last patch in the sequence. Every place that was previously setting prototype has been ported to Lang.Class, to make code more concise and allow for better toString(). https://bugzilla.gnome.org/show_bug.cgi?id=664436
2011-11-20 17:56:27 +00:00
});
Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948
2010-11-12 17:45:29 +00:00
Signals.addSignalMethods(ViewSelector.prototype);
Reference in New Issue Copy Permalink