← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-do/trusty

« back to all changes in this revision

Viewing changes to Do/src/Do.Core/Controller.cs

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2012-03-26 11:12:21 UTC
  • mfrom: (0.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120326111221-1jk143fy37zxi3e4
Tags: 0.9-1
http://bugs.debian.org/665537
* New upstream version no longer uses deprecated internal glib headers.
  (Closes: #665537)
* [59fa37b9] Fix watch file
* [63486516] Imported Upstream version 0.9
* [8c636d84] Disable testsuite for now; requires running dbus and gconf daemons
* [e46de4b9] Remove inaccurate README.Source
* [4591d677] Add git-buildpackage configuration to default to pristine-tar

Show diffs side-by-side

added added

removed removed

Lines of Context:
Do/src/Do.Core/Controller.cs
218
218
                        
219
219
                        Orientation = ControlOrientation.Vertical;
220
220
 
221
 
                        if (Screen.Default.IsComposited) {
 
221
                        if ((Screen.Default.IsComposited) && (!Do.Preferences.ForceClassicWindow)) {
222
222
                                window = InterfaceManager.MaybeGetInterfaceNamed (themeName) ?? new ClassicWindow ();
223
223
                        } else {
224
224
                                window = new ClassicWindow ();
473
473
                        } else if (key == Key.Delete ||
474
474
                                   key == Key.BackSpace) {
475
475
                                OnDeleteKeyPressEvent (evnt);
476
 
                        } else if (Services.Keybinder.Bindings.Any (k => k.KeyString == Services.Keybinder.KeyEventToString (evnt))) {
 
476
                        } else if (Services.Keybinder.Bindings.Any (k => k.KeyString == Services.Keybinder.KeyEventToString (evnt.KeyValue, (uint)evnt.State))) {
477
477
                                // User set keybindings
478
 
                                Services.Keybinder.Bindings.First (k => k.KeyString == Services.Keybinder.KeyEventToString (evnt)).Callback (evnt);
 
478
                                Services.Keybinder.Bindings.First (k => k.KeyString == Services.Keybinder.KeyEventToString (evnt.KeyValue, (uint)evnt.State)).Callback (evnt);
479
479
                        } else {
480
480
                                OnInputKeyPressEvent (evnt);
481
481
                        }