piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 14:19:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

hopefully fix that shit for good

Browse Source
This commit is contained in:
StapleButter
2017-10-05 01:58:41 +02:00
parent a84caacb03
commit d895dfc9fb
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libui_sdl/libui/unix/window.c
View File

@ -19,6 +19,8 @@ struct uiWindow {
uiControl *child; uiControl *child;
int margined; int margined;
int width, height;
int (*onClosing)(uiWindow *, void *); int (*onClosing)(uiWindow *, void *);
void *onClosingData; void *onClosingData;
@ -127,6 +129,20 @@ static void uiWindowShow(uiControl *c)
// don't use gtk_widget_show(); that doesn't bring to front or give keyboard focus // don't use gtk_widget_show(); that doesn't bring to front or give keyboard focus
// (gtk_window_present() does call gtk_widget_show() though) // (gtk_window_present() does call gtk_widget_show() though)
gtk_window_present(w->window); gtk_window_present(w->window);
// set the size properly
int width = w->width;
int height = w->height;
if (w->menubar)
{
GtkRequisition min, nat;
int menuheight;
gtk_widget_get_preferred_size(w->menubar, &min, &nat);
menuheight = min.height;
if (nat.height > menuheight) menuheight = nat.height;
height += menuheight;
}
gtk_window_resize(w->window, width, height);
} }
uiUnixControlDefaultHide(uiWindow) uiUnixControlDefaultHide(uiWindow)
@ -299,6 +315,8 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar,
w->menubar = makeMenubar(uiWindow(w)); w->menubar = makeMenubar(uiWindow(w));
gtk_container_add(w->vboxContainer, w->menubar); gtk_container_add(w->vboxContainer, w->menubar);
} }
else
w->menubar = NULL;
w->childHolderWidget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); w->childHolderWidget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
w->childHolderContainer = GTK_CONTAINER(w->childHolderWidget); w->childHolderContainer = GTK_CONTAINER(w->childHolderWidget);
@ -308,10 +326,6 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar,
gtk_widget_set_valign(w->childHolderWidget, GTK_ALIGN_FILL); gtk_widget_set_valign(w->childHolderWidget, GTK_ALIGN_FILL);
gtk_box_set_homogeneous(GTK_BOX(w->childHolderWidget), TRUE); gtk_box_set_homogeneous(GTK_BOX(w->childHolderWidget), TRUE);
gtk_container_add(w->vboxContainer, w->childHolderWidget); gtk_container_add(w->vboxContainer, w->childHolderWidget);
// TODO: set client size properly
// menubar can consume height
// gtk_widget_set_size_request() is not good as it sets a minimum size
// show everything in the vbox, but not the GtkWindow itself // show everything in the vbox, but not the GtkWindow itself
gtk_widget_show_all(w->vboxWidget); gtk_widget_show_all(w->vboxWidget);
@ -334,6 +348,9 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar,
g_object_ref(w->widget); g_object_ref(w->widget);
gtk_window_set_resizable(w->window, resizable?TRUE:FALSE); gtk_window_set_resizable(w->window, resizable?TRUE:FALSE);
w->width = width;
w->height = height;
return w; return w;
} }