mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-11-10 12:34:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

popup cleanup

Browse Source
This commit is contained in:
Tanasart 2024-09-11 18:01:21 +07:00
parent 56e4982590
commit 3e4b61fc0b
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
objects/o_dialog_menubox/Create_0.gml
View File

@ -85,11 +85,14 @@ event_inherited();
dialog_w += ui(32); dialog_w += ui(32);
var _mon = winMan_getData(); var _mon = winMan_getData();
dialog_y = min(dialog_y, _mon[7] - WIN_Y - dialog_h - 2); var _maxw = PREFERENCES.multi_window? _mon[6] - WIN_X : WIN_W;
var _maxh = PREFERENCES.multi_window? _mon[7] - WIN_Y : WIN_H;
dialog_y = min(dialog_y, _maxh - dialog_h - 2);
switch(align) { switch(align) {
case fa_left: dialog_x = round(min(dialog_x, _mon[6] - WIN_X - dialog_w - 2)); break; case fa_left: dialog_x = round(min(dialog_x, _maxw - dialog_w - 2)); break;
case fa_center: dialog_x = round(min(dialog_x - dialog_w / 2, _mon[6] - WIN_X - dialog_w - 2)); break; case fa_center: dialog_x = round(min(dialog_x - dialog_w / 2, _maxw - dialog_w - 2)); break;
case fa_right: dialog_x = round(max(dialog_x - dialog_w, 2)); break; case fa_right: dialog_x = round(max(dialog_x - dialog_w, 2)); break;
} }
@ -119,6 +122,9 @@ event_inherited();
dialog_x = 0; dialog_x = 0;
dialog_y = 0; dialog_y = 0;
} else if(winwin_exists(window)) {
winwin_destroy(window);
} }
} }
#endregion #endregion

1
objects/o_main/Create_0.gml
View File

@ -55,7 +55,6 @@
fpsr = 0; fpsr = 0;
_cursor_lock = false; _cursor_lock = false;
watcher_surface = surface_create(1, 1); watcher_surface = surface_create(1, 1);
panelInit(); panelInit();

4
scripts/windowManager/windowManager.gml
View File

@ -21,11 +21,11 @@
#macro DISPLAY_REFRESH CURRENT_PANEL = panelSerialize(true); display_refresh(); #macro DISPLAY_REFRESH CURRENT_PANEL = panelSerialize(true); display_refresh();
#endregion #endregion
function winManInit() { #region function winManInit() {
if(OS == os_macosx) mac_window_init(); if(OS == os_macosx) mac_window_init();
window_preminimize_rect = [ 0, 0, 1, 1 ]; window_preminimize_rect = [ 0, 0, 1, 1 ];
} #endregion }
function winMan_getData(curr = true) { function winMan_getData(curr = true) {
INLINE INLINE