File tree Expand file tree Collapse file tree 5 files changed +5
-16
lines changed
native/Avalonia.Native/src/OSX Expand file tree Collapse file tree 5 files changed +5
-16
lines changed Original file line number Diff line number Diff line change 25
25
PopupImpl (IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
26
26
{
27
27
WindowEvents = events;
28
+ [Window setLevel: NSPopUpMenuWindowLevel ];
28
29
}
29
30
protected:
30
31
virtual NSWindowStyleMask GetStyle () override
31
32
{
32
33
return NSWindowStyleMaskBorderless;
33
34
}
34
-
35
- virtual void OnInitialiseNSWindow () override
36
- {
37
- [Window setLevel: NSPopUpMenuWindowLevel ];
38
- }
39
35
40
36
public:
41
37
virtual bool ShouldTakeFocusOnShow () override
Original file line number Diff line number Diff line change @@ -106,8 +106,6 @@ BEGIN_INTERFACE_MAP()
106
106
virtual NSWindowStyleMask GetStyle ();
107
107
108
108
void UpdateStyle ();
109
-
110
- virtual void OnInitialiseNSWindow ();
111
109
112
110
private:
113
111
void CreateNSWindow (bool isDialog);
Original file line number Diff line number Diff line change 566
566
}
567
567
}
568
568
569
- void WindowBaseImpl::OnInitialiseNSWindow ()
570
- {
571
-
572
- }
573
-
574
569
void WindowBaseImpl::InitialiseNSWindow () {
575
570
if (Window != nullptr ) {
576
571
[Window setContentView: StandardContainer];
593
588
[GetWindowProtocol () showWindowMenuWithAppMenu ];
594
589
}
595
590
}
596
-
597
- OnInitialiseNSWindow ();
598
591
}
599
592
}
600
593
Original file line number Diff line number Diff line change @@ -93,8 +93,6 @@ BEGIN_INTERFACE_MAP()
93
93
94
94
virtual bool IsDialog () override;
95
95
96
- virtual void OnInitialiseNSWindow () override;
97
-
98
96
virtual void BringToFront () override;
99
97
100
98
bool CanBecomeKeyWindow ();
@@ -103,6 +101,7 @@ BEGIN_INTERFACE_MAP()
103
101
virtual NSWindowStyleMask GetStyle () override;
104
102
105
103
private:
104
+ void OnInitialiseNSWindow ();
106
105
NSString *_lastTitle;
107
106
};
108
107
Original file line number Diff line number Diff line change 23
23
_lastTitle = @" " ;
24
24
_parent = nullptr ;
25
25
WindowEvents = events;
26
+
27
+ OnInitialiseNSWindow ();
26
28
}
27
29
28
30
void WindowImpl::HideOrShowTrafficLights () {
40
42
41
43
void WindowImpl::OnInitialiseNSWindow (){
42
44
[GetWindowProtocol () setCanBecomeKeyWindow: true ];
45
+
43
46
[Window disableCursorRects ];
44
47
[Window setTabbingMode: NSWindowTabbingModeDisallowed];
45
48
[Window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary];
You can’t perform that action at this time.
0 commit comments