exposed uiWindowShow method, darwin window setup for sane show onfocus …

…andlabs#20
d4tocchini · Apr 3, 2020 · 2ceeff8 · 2ceeff8
1 parent b592bab
commit 2ceeff8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/darwin/window.m b/darwin/window.m
@@ -172,11 +172,16 @@ static int uiWindowVisible(uiControl *c)
 	return [w->window isVisible];
 }
 
-static void uiWindowShow(uiControl *c)
+void uiWindowShow(uiControl *c)
 {
 	uiWindow *w = (uiWindow *) c;
-
+	// TODO: D4
+	// https://developer.apple.com/documentation/appkit/nswindow/1419208-makekeyandorderfront?language=objc
 	[w->window makeKeyAndOrderFront:w->window];
+	[w->window setLevel:NSFloatingWindowLevel];
+	// [w->window orderFrontRegardless];
+	// [w->window makeKeyAndOrderFront:nil];
+	// [w->window orderFront: nil];
 }
 
 static void uiWindowHide(uiControl *c)

diff --git a/examples/controlgallery/main.c b/examples/controlgallery/main.c
@@ -323,6 +323,8 @@ int main(void)
 
 	uiControlShow(uiControl(mainwin));
 	uiMain();
+
+	uiWindowShow(uiControl(mainwin));
 	return 0;
 }
 

diff --git a/ui.h b/ui.h
@@ -131,6 +131,7 @@ _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);
 
 typedef struct uiButton uiButton;
 #define uiButton(this) ((uiButton *) (this))

diff --git a/unix/window.c b/unix/window.c
@@ -98,7 +98,7 @@ static int uiWindowToplevel(uiControl *c)
 
 uiUnixControlDefaultVisible(uiWindow)
 
-static void uiWindowShow(uiControl *c)
+void uiWindowShow(uiControl *c)
 {
 	uiWindow *w = uiWindow(c);
 

diff --git a/windows/window.cpp b/windows/window.cpp
@@ -201,7 +201,7 @@ static int uiWindowVisible(uiControl *c)
 	return w->visible;
 }
 
-static void uiWindowShow(uiControl *c)
+void uiWindowShow(uiControl *c)
 {
 	uiWindow *w = uiWindow(c);