Press Escape to quit

Wassimulator · Sep 10, 2024 · c32dfe9 · c32dfe9
1 parent f1a2a59
commit c32dfe9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/events.cpp b/src/events.cpp
@@ -17,6 +17,12 @@ void reset_inputs() {
     K->scroll_y_diff = 0;
 	K->double_click = 0;
 }
+
+void post_quit() {
+	PostQuitMessage(0);
+	Running = false;
+}
+
 static void set_framebuffer_size(Graphics *ctx, iv2 size, bool set_dpi = false);
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
@@ -27,7 +33,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     case WM_QUIT:
     case WM_DESTROY:    
     {
-        PostQuitMessage(0); Running = false; break;
+        post_quit(); break;
     }
  	case WM_SIZE:
     {

diff --git a/src/source.cpp b/src/source.cpp
@@ -3300,6 +3300,10 @@ static void update_gui() {
 				UI_text(theme->text_header_2, G->ui_font, 12,"F11 key: ");
 				UI_text(theme->text_reg_main, G->ui_font, 12,"Toggle fullscreen mode.");	
 			}
+			UI_push_parent_defer(ctx, UI_bar(axis_x)) {
+				UI_text(theme->text_header_2, G->ui_font, 12,"Esc key: ");
+				UI_text(theme->text_reg_main, G->ui_font, 12,"Exit fullscreen mode. Otherwise, quit.");	
+			}
 			UI_push_parent_defer(ctx, UI_bar(axis_x)) {
 				UI_text(theme->text_header_2, G->ui_font, 12,"R key: ");
 				UI_text(theme->text_reg_main, G->ui_font, 12,"Reload current folder, and scan for new files in it.");	
@@ -3478,6 +3482,7 @@ static void shuffle_folder() {
 
 static void update_logic() {
 	bool WantCaptureMouse = G->ui_want_capture_mouse;
+	bool fullscreen = is_fullscreen(hwnd);
 
     if (G->alert.timer > 0)
         G->alert.timer++;
@@ -3486,8 +3491,10 @@ static void update_logic() {
 
 	if (keyup(Key_F11))
 		toggle_fullscreen(hwnd);
-	if (keyup(Key_Esc) && is_fullscreen(hwnd)) 
+	if (keyup(Key_Esc) && fullscreen) 
 		exit_fullscreen(hwnd);
+	if (keyup(Key_Esc) && !fullscreen)
+		post_quit();
 
 	if (keyup(Key_F)) {
         //send_signal(G->signals.update_filtering);