caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat delete, backspace, and browser back all identically.

Browse Source 
[git-p4: depot-paths = "//depot/solvespace/": change = 2036]
This commit is contained in:
Jonathan Westhues 2009-09-28 02:01:34 -08:00
parent bdf60690c1
commit 9f78ee3c33
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
draw.cpp
View File

@ -924,6 +924,16 @@ void GraphicsWindow::EditControlDone(char *s) {
} }
} }
bool GraphicsWindow::KeyDown(int c) {
if(c == ('h' - 'a') + 1) {
// Treat backspace identically to escape.
MenuEdit(MNU_UNSELECT_ALL);
return true;
}
return false;
}
void GraphicsWindow::MouseScroll(double x, double y, int delta) { void GraphicsWindow::MouseScroll(double x, double y, int delta) {
double offsetRight = offset.Dot(projRight); double offsetRight = offset.Dot(projRight);
double offsetUp = offset.Dot(projUp); double offsetUp = offset.Dot(projUp);

1
ui.h
View File

@ -483,6 +483,7 @@ public:
void MouseRightUp(double x, double y); void MouseRightUp(double x, double y);
void MouseScroll(double x, double y, int delta); void MouseScroll(double x, double y, int delta);
void MouseLeave(void); void MouseLeave(void);
bool KeyDown(int c);
void EditControlDone(char *s); void EditControlDone(char *s);
SDWORD lastSpaceNavigatorTime; SDWORD lastSpaceNavigatorTime;

31
win32/w32main.cpp
View File

@ -533,24 +533,21 @@ static BOOL ProcessKeyDown(WPARAM wParam)
} }
} }
if(wParam == VK_BACK && !GraphicsEditControlIsVisible()) {
TextWindow::ScreenHome(0, 0);
SS.TW.Show();
return TRUE;
}
int c; int c;
switch(wParam) { switch(wParam) {
case VK_OEM_PLUS: c = '+'; break; case VK_OEM_PLUS: c = '+'; break;
case VK_OEM_MINUS: c = '-'; break; case VK_OEM_MINUS: c = '-'; break;
case VK_ESCAPE: c = 27; break; case VK_ESCAPE: c = 27; break;
case VK_OEM_1: c = ';'; break; case VK_OEM_1: c = ';'; break;
case VK_OEM_4: c = '['; break; case VK_OEM_4: c = '['; break;
case VK_OEM_6: c = ']'; break; case VK_OEM_6: c = ']'; break;
case VK_OEM_5: c = '\\'; break; case VK_OEM_5: c = '\\'; break;
case VK_SPACE: c = ' '; break; case VK_SPACE: c = ' '; break;
case VK_DELETE: c = 127; break; case VK_DELETE: c = 127; break;
case VK_TAB: c = '\t'; break; case VK_TAB: c = '\t'; break;
case VK_BROWSER_BACK:
case VK_BACK: c = 1 + 'h' - 'a'; break;
case VK_F1: case VK_F1:
case VK_F2: case VK_F2:
@ -588,6 +585,8 @@ static BOOL ProcessKeyDown(WPARAM wParam)
} }
} }
if(SS.GW.KeyDown(c)) return TRUE;
// No accelerator; process the key as normal. // No accelerator; process the key as normal.
return FALSE; return FALSE;
} }

1
wishlist.txt
View File

@ -1,7 +1,6 @@
grid grid
multi-drag multi-drag
backslash / escape
----- -----
wireframe export wireframe export