Changeset 420

Timestamp:

Apr 20, 2010, 10:36:38 PM (15 years ago)

Author:

dmik

Message:

Use PgUp/PgDn/Home/End for scrolling navigation only if pressed without any modifiers since the modified keys may be used by the accelerator tables for other actions.

File:

• trunk/Lucide/gui/docViewer.cpp (modified) (4 diffs)

trunk/Lucide/gui/docViewer.cpp ¶

@@ -2298 +2298 @@
 
             case VK_PAGEUP:
-                if ( !( fsflags & KC_CTRL ) )
+                if ( !( fsflags & (KC_CTRL | KC_SHIFT | KC_ALT) ) )
                 {
                     bool dojump = ( !isContinuous() && ( sVscrollPos == 0 )
@@ -2314 +2314 @@
 
             case VK_PAGEDOWN:
-                if ( !( fsflags & KC_CTRL ) )
+                if ( !( fsflags & (KC_CTRL | KC_SHIFT | KC_ALT) ) )
                 {
                     bool dojump = ( !isContinuous() && ( sVscrollPos == sVscrollMax ) );
@@ -2325 +2325 @@
                     return TRUE;
                 }
-                break;
+                return FALSE;
 
             case VK_HOME:
-                if ( !( fsflags & KC_CTRL ) )
+                if ( !( fsflags & (KC_CTRL | KC_SHIFT | KC_ALT) ) )
                 {
                     goToPage( 0 );
@@ -2337 +2337 @@
 
             case VK_END:
-                if ( !( fsflags & KC_CTRL ) )
+                if ( !( fsflags & (KC_CTRL | KC_SHIFT | KC_ALT) ) )
                 {
                     goToPage( totalpages - 1 );