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

[v3 mac] Fixed drag

Browse source
This commit is contained in:
Lea Anthony 2023-06-09 17:00:07 +10:00
commit 7c45e3ac13
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
11 changed files with 163 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

8
v3/internal/runtime/desktop/invoke.js
View file

@ -11,4 +11,10 @@ The electron alternative for Go
/* jshint esversion: 9 */
// defined in the Taskfile
export let invoke = (WINDOWS?chrome.webview.postMessage:window.webkit.messageHandlers.external.postMessage);
export let invoke = function(input) {
if(WINDOWS) {
chrome.external.invoke(input);
} else {
webkit.messageHandlers.external.postMessage(input);
}
}

10
v3/internal/runtime/runtime_debug_desktop_darwin.js
View file

File diff suppressed because one or more lines are too long

10
v3/internal/runtime/runtime_debug_desktop_linux.js
View file

File diff suppressed because one or more lines are too long

10
v3/internal/runtime/runtime_debug_desktop_windows.js
View file

File diff suppressed because one or more lines are too long

2
v3/internal/runtime/runtime_production_desktop_darwin.js
View file

File diff suppressed because one or more lines are too long

2
v3/internal/runtime/runtime_production_desktop_linux.js
View file

File diff suppressed because one or more lines are too long

2
v3/internal/runtime/runtime_production_desktop_windows.js
View file

File diff suppressed because one or more lines are too long

5
v3/pkg/application/webview_window_darwin.m
View file

@ -53,7 +53,8 @@ extern bool hasListeners(unsigned int);
[sender orderOut:nil];
return false;
}
return true;
processWindowEvent(self.windowId, EventWindowShouldClose);
return false;
}
- (void) dealloc {
// Makes sure to remove the retained properties so the reference counter of the retains are decreased
@ -63,7 +64,6 @@ extern bool hasListeners(unsigned int);
// Handle script messages from the external bridge
- (void)userContentController:(nonnull WKUserContentController *)userContentController didReceiveScriptMessage:(nonnull WKScriptMessage *)message {
NSString *m = message.body;
if ( [m isEqualToString:@"drag"] ) {
/*
if( [self IsFullScreen] ) {
@ -77,7 +77,6 @@ extern bool hasListeners(unsigned int);
}
return;
}
const char *_m = [m UTF8String];
processMessage(self.windowId, _m);
}

132
v3/pkg/events/events.go
View file

@ -15,7 +15,7 @@ type commonEvents struct {
func newCommonEvents() commonEvents {
return commonEvents{
ApplicationStarted: 1153,
ApplicationStarted: 1154,
}
}
@ -87,6 +87,7 @@ type macEvents struct {
WindowDidUpdateTitle WindowEventType
WindowDidUpdateToolbar WindowEventType
WindowDidUpdateVisibility WindowEventType
WindowShouldClose WindowEventType
WindowWillBecomeKey WindowEventType
WindowWillBecomeMain WindowEventType
WindowWillBeginSheet WindowEventType
@ -213,63 +214,64 @@ func newMacEvents() macEvents {
WindowDidUpdateTitle: 1086,
WindowDidUpdateToolbar: 1087,
WindowDidUpdateVisibility: 1088,
WindowWillBecomeKey: 1089,
WindowWillBecomeMain: 1090,
WindowWillBeginSheet: 1091,
WindowWillChangeOrderingMode: 1092,
WindowWillClose: 1093,
WindowWillDeminiaturize: 1094,
WindowWillEnterFullScreen: 1095,
WindowWillEnterVersionBrowser: 1096,
WindowWillExitFullScreen: 1097,
WindowWillExitVersionBrowser: 1098,
WindowWillFocus: 1099,
WindowWillMiniaturize: 1100,
WindowWillMove: 1101,
WindowWillOrderOffScreen: 1102,
WindowWillOrderOnScreen: 1103,
WindowWillResignMain: 1104,
WindowWillResize: 1105,
WindowWillUnfocus: 1106,
WindowWillUpdate: 1107,
WindowWillUpdateAlpha: 1108,
WindowWillUpdateCollectionBehavior: 1109,
WindowWillUpdateCollectionProperties: 1110,
WindowWillUpdateShadow: 1111,
WindowWillUpdateTitle: 1112,
WindowWillUpdateToolbar: 1113,
WindowWillUpdateVisibility: 1114,
WindowWillUseStandardFrame: 1115,
MenuWillOpen: 1116,
MenuDidOpen: 1117,
MenuDidClose: 1118,
MenuWillSendAction: 1119,
MenuDidSendAction: 1120,
MenuWillHighlightItem: 1121,
MenuDidHighlightItem: 1122,
MenuWillDisplayItem: 1123,
MenuDidDisplayItem: 1124,
MenuWillAddItem: 1125,
MenuDidAddItem: 1126,
MenuWillRemoveItem: 1127,
MenuDidRemoveItem: 1128,
MenuWillBeginTracking: 1129,
MenuDidBeginTracking: 1130,
MenuWillEndTracking: 1131,
MenuDidEndTracking: 1132,
MenuWillUpdate: 1133,
MenuDidUpdate: 1134,
MenuWillPopUp: 1135,
MenuDidPopUp: 1136,
MenuWillSendActionToItem: 1137,
MenuDidSendActionToItem: 1138,
WebViewDidStartProvisionalNavigation: 1139,
WebViewDidReceiveServerRedirectForProvisionalNavigation: 1140,
WebViewDidFinishNavigation: 1141,
WebViewDidCommitNavigation: 1142,
WindowFileDraggingEntered: 1143,
WindowFileDraggingPerformed: 1144,
WindowFileDraggingExited: 1145,
WindowShouldClose: 1089,
WindowWillBecomeKey: 1090,
WindowWillBecomeMain: 1091,
WindowWillBeginSheet: 1092,
WindowWillChangeOrderingMode: 1093,
WindowWillClose: 1094,
WindowWillDeminiaturize: 1095,
WindowWillEnterFullScreen: 1096,
WindowWillEnterVersionBrowser: 1097,
WindowWillExitFullScreen: 1098,
WindowWillExitVersionBrowser: 1099,
WindowWillFocus: 1100,
WindowWillMiniaturize: 1101,
WindowWillMove: 1102,
WindowWillOrderOffScreen: 1103,
WindowWillOrderOnScreen: 1104,
WindowWillResignMain: 1105,
WindowWillResize: 1106,
WindowWillUnfocus: 1107,
WindowWillUpdate: 1108,
WindowWillUpdateAlpha: 1109,
WindowWillUpdateCollectionBehavior: 1110,
WindowWillUpdateCollectionProperties: 1111,
WindowWillUpdateShadow: 1112,
WindowWillUpdateTitle: 1113,
WindowWillUpdateToolbar: 1114,
WindowWillUpdateVisibility: 1115,
WindowWillUseStandardFrame: 1116,
MenuWillOpen: 1117,
MenuDidOpen: 1118,
MenuDidClose: 1119,
MenuWillSendAction: 1120,
MenuDidSendAction: 1121,
MenuWillHighlightItem: 1122,
MenuDidHighlightItem: 1123,
MenuWillDisplayItem: 1124,
MenuDidDisplayItem: 1125,
MenuWillAddItem: 1126,
MenuDidAddItem: 1127,
MenuWillRemoveItem: 1128,
MenuDidRemoveItem: 1129,
MenuWillBeginTracking: 1130,
MenuDidBeginTracking: 1131,
MenuWillEndTracking: 1132,
MenuDidEndTracking: 1133,
MenuWillUpdate: 1134,
MenuDidUpdate: 1135,
MenuWillPopUp: 1136,
MenuDidPopUp: 1137,
MenuWillSendActionToItem: 1138,
MenuDidSendActionToItem: 1139,
WebViewDidStartProvisionalNavigation: 1140,
WebViewDidReceiveServerRedirectForProvisionalNavigation: 1141,
WebViewDidFinishNavigation: 1142,
WebViewDidCommitNavigation: 1143,
WindowFileDraggingEntered: 1144,
WindowFileDraggingPerformed: 1145,
WindowFileDraggingExited: 1146,
}
}
@ -287,12 +289,12 @@ type windowsEvents struct {
func newWindowsEvents() windowsEvents {
return windowsEvents{
SystemThemeChanged: 1146,
APMPowerStatusChange: 1147,
APMSuspend: 1148,
APMResumeAutomatic: 1149,
APMResumeSuspend: 1150,
APMPowerSettingChange: 1151,
WebViewNavigationCompleted: 1152,
SystemThemeChanged: 1147,
APMPowerStatusChange: 1148,
APMSuspend: 1149,
APMResumeAutomatic: 1150,
APMResumeSuspend: 1151,
APMPowerSettingChange: 1152,
WebViewNavigationCompleted: 1153,
}
}

117
v3/pkg/events/events.h
View file

@ -71,65 +71,66 @@ extern void processWindowEvent(unsigned int, unsigned int);
#define EventWindowDidUpdateTitle 1086
#define EventWindowDidUpdateToolbar 1087
#define EventWindowDidUpdateVisibility 1088
#define EventWindowWillBecomeKey 1089
#define EventWindowWillBecomeMain 1090
#define EventWindowWillBeginSheet 1091
#define EventWindowWillChangeOrderingMode 1092
#define EventWindowWillClose 1093
#define EventWindowWillDeminiaturize 1094
#define EventWindowWillEnterFullScreen 1095
#define EventWindowWillEnterVersionBrowser 1096
#define EventWindowWillExitFullScreen 1097
#define EventWindowWillExitVersionBrowser 1098
#define EventWindowWillFocus 1099
#define EventWindowWillMiniaturize 1100
#define EventWindowWillMove 1101
#define EventWindowWillOrderOffScreen 1102
#define EventWindowWillOrderOnScreen 1103
#define EventWindowWillResignMain 1104
#define EventWindowWillResize 1105
#define EventWindowWillUnfocus 1106
#define EventWindowWillUpdate 1107
#define EventWindowWillUpdateAlpha 1108
#define EventWindowWillUpdateCollectionBehavior 1109
#define EventWindowWillUpdateCollectionProperties 1110
#define EventWindowWillUpdateShadow 1111
#define EventWindowWillUpdateTitle 1112
#define EventWindowWillUpdateToolbar 1113
#define EventWindowWillUpdateVisibility 1114
#define EventWindowWillUseStandardFrame 1115
#define EventMenuWillOpen 1116
#define EventMenuDidOpen 1117
#define EventMenuDidClose 1118
#define EventMenuWillSendAction 1119
#define EventMenuDidSendAction 1120
#define EventMenuWillHighlightItem 1121
#define EventMenuDidHighlightItem 1122
#define EventMenuWillDisplayItem 1123
#define EventMenuDidDisplayItem 1124
#define EventMenuWillAddItem 1125
#define EventMenuDidAddItem 1126
#define EventMenuWillRemoveItem 1127
#define EventMenuDidRemoveItem 1128
#define EventMenuWillBeginTracking 1129
#define EventMenuDidBeginTracking 1130
#define EventMenuWillEndTracking 1131
#define EventMenuDidEndTracking 1132
#define EventMenuWillUpdate 1133
#define EventMenuDidUpdate 1134
#define EventMenuWillPopUp 1135
#define EventMenuDidPopUp 1136
#define EventMenuWillSendActionToItem 1137
#define EventMenuDidSendActionToItem 1138
#define EventWebViewDidStartProvisionalNavigation 1139
#define EventWebViewDidReceiveServerRedirectForProvisionalNavigation 1140
#define EventWebViewDidFinishNavigation 1141
#define EventWebViewDidCommitNavigation 1142
#define EventWindowFileDraggingEntered 1143
#define EventWindowFileDraggingPerformed 1144
#define EventWindowFileDraggingExited 1145
#define EventWindowShouldClose 1089
#define EventWindowWillBecomeKey 1090
#define EventWindowWillBecomeMain 1091
#define EventWindowWillBeginSheet 1092
#define EventWindowWillChangeOrderingMode 1093
#define EventWindowWillClose 1094
#define EventWindowWillDeminiaturize 1095
#define EventWindowWillEnterFullScreen 1096
#define EventWindowWillEnterVersionBrowser 1097
#define EventWindowWillExitFullScreen 1098
#define EventWindowWillExitVersionBrowser 1099
#define EventWindowWillFocus 1100
#define EventWindowWillMiniaturize 1101
#define EventWindowWillMove 1102
#define EventWindowWillOrderOffScreen 1103
#define EventWindowWillOrderOnScreen 1104
#define EventWindowWillResignMain 1105
#define EventWindowWillResize 1106
#define EventWindowWillUnfocus 1107
#define EventWindowWillUpdate 1108
#define EventWindowWillUpdateAlpha 1109
#define EventWindowWillUpdateCollectionBehavior 1110
#define EventWindowWillUpdateCollectionProperties 1111
#define EventWindowWillUpdateShadow 1112
#define EventWindowWillUpdateTitle 1113
#define EventWindowWillUpdateToolbar 1114
#define EventWindowWillUpdateVisibility 1115
#define EventWindowWillUseStandardFrame 1116
#define EventMenuWillOpen 1117
#define EventMenuDidOpen 1118
#define EventMenuDidClose 1119
#define EventMenuWillSendAction 1120
#define EventMenuDidSendAction 1121
#define EventMenuWillHighlightItem 1122
#define EventMenuDidHighlightItem 1123
#define EventMenuWillDisplayItem 1124
#define EventMenuDidDisplayItem 1125
#define EventMenuWillAddItem 1126
#define EventMenuDidAddItem 1127
#define EventMenuWillRemoveItem 1128
#define EventMenuDidRemoveItem 1129
#define EventMenuWillBeginTracking 1130
#define EventMenuDidBeginTracking 1131
#define EventMenuWillEndTracking 1132
#define EventMenuDidEndTracking 1133
#define EventMenuWillUpdate 1134
#define EventMenuDidUpdate 1135
#define EventMenuWillPopUp 1136
#define EventMenuDidPopUp 1137
#define EventMenuWillSendActionToItem 1138
#define EventMenuDidSendActionToItem 1139
#define EventWebViewDidStartProvisionalNavigation 1140
#define EventWebViewDidReceiveServerRedirectForProvisionalNavigation 1141
#define EventWebViewDidFinishNavigation 1142
#define EventWebViewDidCommitNavigation 1143
#define EventWindowFileDraggingEntered 1144
#define EventWindowFileDraggingPerformed 1145
#define EventWindowFileDraggingExited 1146
#define MAX_EVENTS 1146
#define MAX_EVENTS 1147
#endif

1
v3/pkg/events/events.txt
View file

@ -63,6 +63,7 @@ mac:WindowDidUpdateShadow
mac:WindowDidUpdateTitle
mac:WindowDidUpdateToolbar
mac:WindowDidUpdateVisibility
mac:WindowShouldClose!
mac:WindowWillBecomeKey
mac:WindowWillBecomeMain
mac:WindowWillBeginSheet