darwin implementation for uiWindowSetCentered

Author: d4tocchini

darwin/window.m

@@ -16,6 +16,7 @@
 	BOOL suppressSizeChanged;
 	int fullscreen;
 	int borderless;
+	int centered;
 };
 
 @implementation uiprivNSWindow
@@ -172,9 +173,9 @@ static int uiWindowVisible(uiControl *c)
 	return [w->window isVisible];
 }
 
-void uiWindowShow(uiControl *c)
+void uiWindowShow(uiWindow *w)
 {
-	uiWindow *w = (uiWindow *) c;
+	// uiWindow *w = (uiWindow *) c;
 	// TODO: D4
 	// https://developer.apple.com/documentation/appkit/nswindow/1419208-makekeyandorderfront?language=objc
 	[w->window makeKeyAndOrderFront:w->window];
@@ -184,6 +185,13 @@ void uiWindowShow(uiControl *c)
 	// [w->window orderFront: nil];
 }
 
+void uiWindowSetCentered(uiWindow *w, int centered) {
+	w->centered = centered;
+	if (centered) {
+		[w->window center];
+	}
+}
+
 static void uiWindowHide(uiControl *c)
 {
 	uiWindow *w = (uiWindow *) c;
@@ -226,6 +234,10 @@ static void windowRelayout(uiWindow *w)
 		uiDarwinControlHugsBottom(uiDarwinControl(w->child)),
 		w->margined,
 		@"uiWindow");
+
+	if (w->centered) {
+		[w->window center];
+	}
 }
 
 uiDarwinControlDefaultHugsTrailingEdge(uiWindow, window)
@@ -386,6 +398,17 @@ static void defaultOnPositionContentSizeChanged(uiWindow *w, void *data)
 		defer:YES];
 	[w->window setTitle:uiprivToNSString(title)];
 
+	w->centered = 1;
+
+	// https://github.com/andlabs/libui/pull/271/files
+	// if (NSEqualPoints(lastTopLeftPoint, NSZeroPoint)) {
+	// 	// issue "cascadeTopLeftFromPoint" twice on first time
+	// 	// to have window position in a good place
+	// 	lastTopLeftPoint = [w->window cascadeTopLeftFromPoint:lastTopLeftPoint];
+	// }
+	// lastTopLeftPoint = [w->window cascadeTopLeftFromPoint:lastTopLeftPoint];
+
+
 	// do NOT release when closed
 	// we manually do this in uiWindowDestroy() above
 	[w->window setReleasedWhenClosed:NO];

examples/controlgallery/main.c

@@ -305,6 +305,8 @@ int main(void)
 	}
 
 	mainwin = uiNewWindow("libui Control Gallery", 640, 480, 1);
+
+
 	uiWindowOnClosing(mainwin, onClosing, NULL);
 	uiOnShouldQuit(onShouldQuit, mainwin);
 
@@ -324,7 +326,7 @@ int main(void)
 	uiControlShow(uiControl(mainwin));
 	uiMain();
 
-	uiWindowShow(uiControl(mainwin));
+	uiWindowShow(mainwin);
 	return 0;
 }
 

ui.h

@@ -131,7 +131,8 @@ _UI_EXTERN void uiWindowSetChild(uiWindow *w, uiControl *child);
 _UI_EXTERN int uiWindowMargined(uiWindow *w);
 _UI_EXTERN void uiWindowSetMargined(uiWindow *w, int margined);
 _UI_EXTERN uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar);
-_UI_EXTERN void uiWindowShow(uiControl *c);
+_UI_EXTERN void uiWindowShow(uiWindow *c);
+_UI_EXTERN void uiWindowSetCentered(uiWindow *c, int centered);
 
 typedef struct uiButton uiButton;
 #define uiButton(this) ((uiButton *) (this))

unix/window.c

@@ -19,6 +19,7 @@ struct uiWindow {
 
 	uiControl *child;
 	int margined;
+	int centered;
 
 	int (*onClosing)(uiWindow *, void *);
 	void *onClosingData;
@@ -98,16 +99,19 @@ static int uiWindowToplevel(uiControl *c)
 
 uiUnixControlDefaultVisible(uiWindow)
 
-void uiWindowShow(uiControl *c)
+void uiWindowShow(uiWindow *w)
 {
-	uiWindow *w = uiWindow(c);
-
 	// don't use gtk_widget_show_all() as that will show all children, regardless of user settings
 	// 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(w->window);
 }
 
+void uiWindowSetCentered(uiWindow *w, int centered) {
+	w->centered = centered;
+	// TODO:
+}
+
 uiUnixControlDefaultHide(uiWindow)
 uiUnixControlDefaultEnabled(uiWindow)
 uiUnixControlDefaultEnable(uiWindow)

windows/window.cpp

@@ -20,6 +20,7 @@ struct uiWindow {
 	int fullscreen;
 	WINDOWPLACEMENT fsPrevPlacement;
 	int borderless;
+	int centered;
 };
 
 // from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
@@ -201,9 +202,9 @@ static int uiWindowVisible(uiControl *c)
 	return w->visible;
 }
 
-void uiWindowShow(uiControl *c)
+void uiWindowShow(uiWindow *w)
 {
-	uiWindow *w = uiWindow(c);
+	// uiWindow *w = uiWindow(c);
 
 	w->visible = 1;
 	// just in case the window's minimum size wasn't recalculated already
@@ -228,6 +229,11 @@ static void uiWindowHide(uiControl *c)
 	ShowWindow(w->hwnd, SW_HIDE);
 }
 
+void uiWindowSetCentered(uiWindow *w, int centered) {
+	w->centered = centered;
+	// TODO:
+}
+
 // TODO we don't want the window to be disabled completely; that would prevent it from being moved! ...would it?
 uiWindowsControlDefaultEnabled(uiWindow)
 uiWindowsControlDefaultEnable(uiWindow)