deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

revert back to basic boolean

Browse source
This commit is contained in:
grantmartin2002-oss 2026-03-05 17:25:13 -06:00
commit 267bed3e64
2 changed files with 18 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

42
v3/pkg/application/webview_window_darwin.go
View file

@ -22,10 +22,10 @@ struct WebviewPreferences {
};
struct PanelPreferences {
bool *FloatingPanel;
bool *BecomesKeyOnlyIfNeeded;
bool *NonactivatingPanel;
bool *UtilityWindow;
bool FloatingPanel;
bool BecomesKeyOnlyIfNeeded;
bool NonactivatingPanel;
bool UtilityWindow;
};
extern void registerListener(unsigned int event);
@ -193,10 +193,10 @@ void* panelNew(unsigned int id, int width, int height, bool fraudulentWebsiteWar
if (frameless) {
styleMask = NSWindowStyleMaskBorderless | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable;
}
if (panelPreferences.NonactivatingPanel != NULL && *panelPreferences.NonactivatingPanel) {
if (panelPreferences.NonactivatingPanel) {
styleMask |= NSWindowStyleMaskNonactivatingPanel;
}
if (panelPreferences.UtilityWindow != NULL && *panelPreferences.UtilityWindow) {
if (panelPreferences.UtilityWindow) {
styleMask |= NSWindowStyleMaskUtilityWindow;
}
// if panel, create panel add panelpreferneces, else create window
@ -205,12 +205,8 @@ void* panelNew(unsigned int id, int width, int height, bool fraudulentWebsiteWar
backing:NSBackingStoreBuffered
defer:NO];
if (panelPreferences.FloatingPanel != NULL) {
[panel setFloatingPanel:*panelPreferences.FloatingPanel];
}
if (panelPreferences.BecomesKeyOnlyIfNeeded != NULL) {
[panel setBecomesKeyOnlyIfNeeded:*panelPreferences.BecomesKeyOnlyIfNeeded];
}
[panel setFloatingPanel:panelPreferences.FloatingPanel];
[panel setBecomesKeyOnlyIfNeeded:panelPreferences.BecomesKeyOnlyIfNeeded];
// Create delegate (same as window)
WebviewWindowDelegate* delegate = [[WebviewWindowDelegate alloc] init];
@ -1315,22 +1311,12 @@ func (w *macosWebviewWindow) getWebviewPreferences() C.struct_WebviewPreferences
func (w *macosWebviewWindow) getPanelPreferences() C.struct_PanelPreferences {
panelPrefs := w.parent.options.Mac.PanelPreferences
var result C.struct_PanelPreferences
if panelPrefs.FloatingPanel.IsSet() {
result.FloatingPanel = bool2CboolPtr(panelPrefs.FloatingPanel.Get())
return C.struct_PanelPreferences{
FloatingPanel: C.bool(panelPrefs.FloatingPanel),
BecomesKeyOnlyIfNeeded: C.bool(panelPrefs.BecomesKeyOnlyIfNeeded),
NonactivatingPanel: C.bool(panelPrefs.NonactivatingPanel),
UtilityWindow: C.bool(panelPrefs.UtilityWindow),
}
if panelPrefs.BecomesKeyOnlyIfNeeded.IsSet() {
result.BecomesKeyOnlyIfNeeded = bool2CboolPtr(panelPrefs.BecomesKeyOnlyIfNeeded.Get())
}
if panelPrefs.NonactivatingPanel.IsSet() {
result.NonactivatingPanel = bool2CboolPtr(panelPrefs.NonactivatingPanel.Get())
}
if panelPrefs.UtilityWindow.IsSet() {
result.UtilityWindow = bool2CboolPtr(panelPrefs.UtilityWindow.Get())
}
return result
}
func (w *macosWebviewWindow) run() {
@ -1394,7 +1380,7 @@ func (w *macosWebviewWindow) run() {
// (setFloatingPanel:YES already sets NSFloatingWindowLevel, so don't override it)
if macOptions.WindowLevel != "" {
w.setWindowLevel(macOptions.WindowLevel)
} else if !(macOptions.WindowClass == MacWindowClassPanel && macOptions.PanelPreferences.FloatingPanel.IsSet() && macOptions.PanelPreferences.FloatingPanel.Get()) {
} else if !(macOptions.WindowClass == MacWindowClassPanel && macOptions.PanelPreferences.FloatingPanel) {
w.setWindowLevel(MacWindowLevelNormal)
}

8
v3/pkg/application/webview_window_options.go
View file

@ -506,13 +506,13 @@ const (
// MacPanelPreferences contains options for MacWindowClassPanel windows
type MacPanelPreferences struct {
// FloatingPanel will make the panel float above other windows
FloatingPanel u.Bool
FloatingPanel bool
// BecomesKeyOnlyIfNeeded will make the panel become key only when needed
BecomesKeyOnlyIfNeeded u.Bool
BecomesKeyOnlyIfNeeded bool
// NonactivatingPanel will apply the NSWindowStyleMaskNonactivatingPanel style
NonactivatingPanel u.Bool
NonactivatingPanel bool
// UtilityWindow will apply the NSWindowStyleMaskUtilityWindow style
UtilityWindow u.Bool
UtilityWindow bool
}
type MacWindowLevel string