Skip to content

AUv2: take a request_resize made inside gui->create() as the view's initial size #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
busticated wants to merge 1 commit into from
Closed

AUv2: take a request_resize made inside gui->create() as the view's initial size #591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/detail/auv2/wrappedview.asinclude.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ @interface CLAP_WRAPPER_COCOA_CLASS_NSVIEW : NSView
float lastScale;
NSSize underlyingUISize;
bool setSizeByZoom; // use this flag to see if resize comes from here or from external
bool creating; // inside gui->create(), before [super initWithFrame:] has run
bool sizeRequested; // a request_resize arrived while creating
NSSize requestedSize;
}

- (id)initWithAUv2:(free_audio::auv2_wrapper::ui_connection *)cont preferredSize:(NSSize)size;
Expand Down Expand Up @@ -98,7 +101,11 @@ - (id)initWithAUv2:(free_audio::auv2_wrapper::ui_connection *)cont preferredSize
{
ui._registerWindow((clap_window_t *)self, &canary);
}
// create() may call request_resize (#582), which lands in -setFrame: below before this view is
// initialized; the size it asks for becomes the initial frame instead
creating = true;
ui._createWindow();
creating = false;
auto gui = ui._plugin->_ext._gui;

// actually, the host should send an appropriate size,
Expand All @@ -107,7 +114,11 @@ - (id)initWithAUv2:(free_audio::auv2_wrapper::ui_connection *)cont preferredSize
{
// gui->get_size(ui._plugin->_plugin,)
uint32_t w, h;
if (gui->get_size(ui._plugin->_plugin, &w, &h))
if (sizeRequested)
{
size = requestedSize;
}
else if (gui->get_size(ui._plugin->_plugin, &w, &h))
{
size = {(double)w, (double)h};
}
Expand Down Expand Up @@ -193,6 +204,12 @@ - (void)dealloc
}
- (void)setFrame:(NSRect)newSize
{
if (creating)
{
requestedSize = newSize.size;
sizeRequested = true;
return;
}
[super setFrame:newSize];
const auto mainThreadMutex = ui._mainThreadMutex;
const ausdk::AUEntryGuard mainThreadGuard(mainThreadMutex.get());
Expand Down
Loading