diff --git a/config.h b/config.h index 29ba7fa..e62d254 100644 --- a/config.h +++ b/config.h @@ -2,13 +2,10 @@ #include /* Key user config */ +#define HEIGHT 1080 #define FULL_WIDTH 1920 #define WIDTH FULL_WIDTH #define BAR_WIDTH FULL_WIDTH/2 -#define HEIGHT_GTK3 990 -#define HEIGHT_GTK4 1080 -// GTK4 and GTK3 interpret height differently. -// In GTK4, it includes the height of the top bar /* More user config */ #define ZOOM_START_LEVEL 1.8 diff --git a/rosenrot3.c b/rosenrot3.c index 42e11bf..87395ed 100644 --- a/rosenrot3.c +++ b/rosenrot3.c @@ -399,7 +399,7 @@ int main(int argc, char** argv) // Window window = GTK_WINDOW(gtk_window_new(0)); - gtk_window_set_default_size(window, WIDTH, HEIGHT_GTK3); + gtk_window_set_default_size(window, WIDTH, HEIGHT); // Notebook notebook = GTK_NOTEBOOK(gtk_notebook_new()); gtk_notebook_set_show_tabs(notebook, false); diff --git a/rosenrot4.c b/rosenrot4.c index 6b609c1..38be4ac 100644 --- a/rosenrot4.c +++ b/rosenrot4.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "config.h" #include "plugins/plugins.h" @@ -39,7 +40,7 @@ void load_uri(WebKitWebView* view, const char* uri) if (is_empty_uri) { webkit_web_view_load_uri(view, ""); toggle_bar(notebook, _SEARCH); - return + return; } bool has_direct_uri_prefix = g_str_has_prefix(uri, "http://") || g_str_has_prefix(uri, "https://") || g_str_has_prefix(uri, "file://") || g_str_has_prefix(uri, "about:"); @@ -53,7 +54,7 @@ void load_uri(WebKitWebView* view, const char* uri) char tmp[strlen("https://") + strlen(uri) + 1]; snprintf(tmp, sizeof(tmp) + 1, "https://%s", uri); webkit_web_view_load_uri(view, tmp); - return + return; } int l = SHORTCUT_N + strlen(uri) + 1; @@ -63,7 +64,7 @@ void load_uri(WebKitWebView* view, const char* uri) bool has_shortcut = (check == 2); if (has_shortcut){ webkit_web_view_load_uri(view, uri_expanded); - return + return; } char tmp[strlen(uri) + strlen(SEARCH)];