Updating code to follow current coding style

Author: AlbertShown

src/webui.c

@@ -276,6 +276,10 @@ typedef struct webui_event_inf_t {
         unsigned int y;
         bool stop;
     } _webui_wv_linux_t;
+
+    #define GTK_SET_SHOW (win, status) if (win->webView && win->has_all_events) win->webView->in_show = status;
+    #define GTK_IS_SHOW  (win) ((win->webView && win->has_all_events) ? win->webView->in_show : true)
+
 #else
     extern bool _webui_macos_wv_new(int index, bool frameless, bool resizable);
     extern void _webui_macos_wv_new_thread_safe(int index, bool frameless, bool resizable);
@@ -8176,15 +8180,6 @@ static const char* _webui_get_local_ip(void) {
     #endif
 }
 
-
-#if __linux__
-#define CHECK_IN_SHOW(win, check) if (win->webView && win->has_all_events) win->webView->in_show = check;
-#define IS_IN_SHOW(win) ((win->webView && win->has_all_events) ? win->webView->in_show : true)
-#else
-#define CHECK_IN_SHOW(win, check)
-#define IS_IN_SHOW(win)
-#endif
-
 static bool _webui_show_window(_webui_window_t* win, struct mg_connection* client, const char* content, int type, size_t browser) {
 
     #ifdef WEBUI_LOG
@@ -8198,8 +8193,6 @@ static bool _webui_show_window(_webui_window_t* win, struct mg_connection* clien
         _webui_log_debug("[Core]\t\t_webui_show_window(FILE, [%zu])\n", browser);
     #endif
 
-    CHECK_IN_SHOW(win, true)
-
     #ifdef WEBUI_TLS
     // TLS
     if (_webui_is_empty(_webui.ssl_cert) || _webui_is_empty(_webui.ssl_key)) {
@@ -8230,7 +8223,6 @@ static bool _webui_show_window(_webui_window_t* win, struct mg_connection* clien
             _webui_free_mem((void*)ssl_cert);
             _webui_free_mem((void*)ssl_key);
             WEBUI_ASSERT("Generating self-signed TLS certificate failed");
-            CHECK_IN_SHOW(win, false)
             return false;
         }
 
@@ -8415,7 +8407,6 @@ static bool _webui_show_window(_webui_window_t* win, struct mg_connection* clien
                 _webui_free_mem((void*)win->url);
                 _webui_free_port(win->server_port);
                 win->server_port = 0;
-                CHECK_IN_SHOW(win, false)
                 return false;
             }            
         }
@@ -11863,6 +11854,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
     #define GTK_RUNTIME_ARR { "libgtk-3.so.0" } // TODO: Add GTK v4 APIs "libgtk-4.so.1"
     #define WEBKIT_RUNTIME_ARR { "libwebkit2gtk-4.1.so.0", "libwebkit2gtk-4.0.so.37" }
 
+    // Decision Event
+    #define WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION 0
+    #define WEBKIT_NAVIGATION_TYPE_LINK_CLICKED     0
+    #define WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED   1
+    #define WEBKIT_NAVIGATION_TYPE_BACK_FORWARD     2
+    #define WEBKIT_NAVIGATION_TYPE_RELOAD           3
+    #define WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED 4
+    #define WEBKIT_NAVIGATION_TYPE_OTHER            5
+
     // Title Event
     static void _webui_wv_event_title(void *web_view, void *pspec, void *arg) {
         #ifdef WEBUI_LOG
@@ -11879,15 +11879,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
         }
     }
 
-    // Decision Event
-    #define WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION 0
-    #define WEBKIT_NAVIGATION_TYPE_LINK_CLICKED     0
-    #define WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED   1
-    #define WEBKIT_NAVIGATION_TYPE_BACK_FORWARD     2
-    #define WEBKIT_NAVIGATION_TYPE_RELOAD           3
-    #define WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED 4
-    #define WEBKIT_NAVIGATION_TYPE_OTHER            5
-
     static bool _webui_wv_event_decision(void *widget, void *decision, int decision_type, void *user_data) {
         switch(decision_type) {
             case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: {
@@ -11898,8 +11889,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
                     return false;
                 }
 
-                if (IS_IN_SHOW(win)) {
-                    CHECK_IN_SHOW(win, false)
+                if (GTK_IS_SHOW(win)) {
+                    GTK_SET_SHOW(win, false)
                     return false;
                 }
 
@@ -12132,7 +12123,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
         }
 
         // Show
-        CHECK_IN_SHOW(win, true)
+        GTK_SET_SHOW(win, true) // TODO: Check if we need this here because we are about to load a URI
         webkit_web_view_load_uri(win->webView->gtk_wv, win->webView->url);
         gtk_widget_show_all(win->webView->gtk_win);
         win->webView->open = true;
@@ -12424,6 +12415,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
             }
         }
 
+        if (_webui.is_webview) {
+            // We have a Linux WebKitGTK WebView running
+            GTK_SET_SHOW(win, true)
+        } else {
+            // Failed to start the Linux WebKitGTK
+            GTK_SET_SHOW(win, false)
+        }
+
         #ifdef WEBUI_LOG
         _webui_log_debug("[Core]\t\t_webui_wv_show() -> Return [%d]\n", (_webui.is_webview == true));
         #endif