Skip to content

Commit 8499a55

Browse files
committed
Merge pull request AvaloniaUI#8258 from AvaloniaUI/fixes/osx-keyboard-input
OSX: fix call to virtual method from ctor.
1 parent bd6d665 commit 8499a55

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

native/Avalonia.Native/src/OSX/PopupImpl.mm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@
2525
PopupImpl(IAvnWindowEvents* events, IAvnGlContext* gl) : WindowBaseImpl(events, gl)
2626
{
2727
WindowEvents = events;
28+
[Window setLevel:NSPopUpMenuWindowLevel];
2829
}
2930
protected:
3031
virtual NSWindowStyleMask GetStyle() override
3132
{
3233
return NSWindowStyleMaskBorderless;
3334
}
34-
35-
virtual void OnInitialiseNSWindow () override
36-
{
37-
[Window setLevel:NSPopUpMenuWindowLevel];
38-
}
3935

4036
public:
4137
virtual bool ShouldTakeFocusOnShow() override

native/Avalonia.Native/src/OSX/WindowBaseImpl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ BEGIN_INTERFACE_MAP()
106106
virtual NSWindowStyleMask GetStyle();
107107

108108
void UpdateStyle();
109-
110-
virtual void OnInitialiseNSWindow ();
111109

112110
private:
113111
void CreateNSWindow (bool isDialog);

native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -566,11 +566,6 @@
566566
}
567567
}
568568

569-
void WindowBaseImpl::OnInitialiseNSWindow()
570-
{
571-
572-
}
573-
574569
void WindowBaseImpl::InitialiseNSWindow() {
575570
if(Window != nullptr) {
576571
[Window setContentView:StandardContainer];
@@ -593,8 +588,6 @@
593588
[GetWindowProtocol() showWindowMenuWithAppMenu];
594589
}
595590
}
596-
597-
OnInitialiseNSWindow();
598591
}
599592
}
600593

native/Avalonia.Native/src/OSX/WindowImpl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ BEGIN_INTERFACE_MAP()
9393

9494
virtual bool IsDialog() override;
9595

96-
virtual void OnInitialiseNSWindow() override;
97-
9896
virtual void BringToFront () override;
9997

10098
bool CanBecomeKeyWindow ();
@@ -103,6 +101,7 @@ BEGIN_INTERFACE_MAP()
103101
virtual NSWindowStyleMask GetStyle() override;
104102

105103
private:
104+
void OnInitialiseNSWindow();
106105
NSString *_lastTitle;
107106
};
108107

native/Avalonia.Native/src/OSX/WindowImpl.mm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
_lastTitle = @"";
2424
_parent = nullptr;
2525
WindowEvents = events;
26+
27+
OnInitialiseNSWindow();
2628
}
2729

2830
void WindowImpl::HideOrShowTrafficLights() {
@@ -40,6 +42,7 @@
4042

4143
void WindowImpl::OnInitialiseNSWindow(){
4244
[GetWindowProtocol() setCanBecomeKeyWindow:true];
45+
4346
[Window disableCursorRects];
4447
[Window setTabbingMode:NSWindowTabbingModeDisallowed];
4548
[Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];

0 commit comments

Comments
 (0)