github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 23:21:58 +08:00
Code Projects Activity

[mac] Fix SetPosition

Browse Source
This commit is contained in:
Lea Anthony 2021-10-30 16:31:06 +11:00
parent 4be4946756
commit 1dd957f461
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2/internal/frontend/desktop/darwin/Application.m
View File

@ -83,7 +83,7 @@ void SetMaxSize(void* inctx, int width, int height) {
void SetPosition(void* inctx, int x, int y) { void SetPosition(void* inctx, int x, int y) {
WailsContext *ctx = (__bridge WailsContext*) inctx; WailsContext *ctx = (__bridge WailsContext*) inctx;
ON_MAIN_THREAD( ON_MAIN_THREAD(
[ctx SetSize:x :y]; [ctx SetPosition:x :y];
); );
} }

6
v2/internal/frontend/desktop/darwin/WailsContext.m
View File

@ -42,9 +42,9 @@
NSScreen* screen = [self getCurrentScreen]; NSScreen* screen = [self getCurrentScreen];
NSRect windowFrame = [self.mainWindow frame]; NSRect windowFrame = [self.mainWindow frame];
NSRect screenFrame = [screen visibleFrame]; NSRect screenFrame = [screen frame];
windowFrame.origin.x += screenFrame.origin.x + (float)x; windowFrame.origin.x = screenFrame.origin.x + (float)x;
windowFrame.origin.y += (screenFrame.origin.y + screenFrame.size.height) - windowFrame.size.height - (float)y; windowFrame.origin.y = (screenFrame.origin.y + screenFrame.size.height) - windowFrame.size.height - (float)y;
[self.mainWindow setFrame:windowFrame display:TRUE animate:FALSE]; [self.mainWindow setFrame:windowFrame display:TRUE animate:FALSE];
} }

1
v2/internal/frontend/desktop/darwin/main.m
View File

@ -228,6 +228,7 @@ int main(int argc, const char * argv[]) {
AppendSubmenu(m, submenu); AppendSubmenu(m, submenu);
UpdateMenuItem(menuITem, 1); UpdateMenuItem(menuITem, 1);
SetAsApplicationMenu(result, m); SetAsApplicationMenu(result, m);
SetPosition(result, 100, 100);