Browse Source

Merge branch 'master' into master

pull/210/head
CapRat GitHub 6 years ago
parent
commit
3f3d8ec9f2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 2 deletions
  1. +2
    -2
      Makefile.base.mk
  2. +33
    -0
      dgl/src/pugl/pugl_osx.m
  3. +2
    -0
      distrho/src/DistrhoPluginLV2export.cpp

+ 2
- 2
Makefile.base.mk View File

@@ -129,10 +129,10 @@ endif
# Set build and link flags

BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
BASE_OPTS = -O3 -ffast-math -mtune=generic -fdata-sections -ffunction-sections
BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections

ifeq ($(CPU_I386_OR_X86_64),true)
BASE_OPTS += -msse -msse2
BASE_OPTS += -mtune=generic -msse -msse2
endif

ifeq ($(CPU_ARM),true)


+ 33
- 0
dgl/src/pugl/pugl_osx.m View File

@@ -329,6 +329,7 @@ flagsChanged(NSView<PuglGenericView> *self, NSEvent *event)
- (void) keyDown:(NSEvent*)event;
- (void) keyUp:(NSEvent*)event;
- (void) flagsChanged:(NSEvent*)event;
- (void) resizeWithOldSuperviewSize:(NSSize)oldSize;

@end

@@ -527,6 +528,21 @@ flagsChanged(NSView<PuglGenericView> *self, NSEvent *event)
flagsChanged(self, event);
}

- (void) resizeWithOldSuperviewSize:(NSSize)oldSize
{
PuglView *pv = self->puglview;

if (pv->width <= 1 && pv->height <= 1)
{
/* NOTE: if the view size was not initialized yet, don't perform an
autoresize; it fixes manual resizing in Reaper.
*/
return;
}

[super resizeWithOldSuperviewSize:oldSize];
}

@end
#endif

@@ -570,6 +586,7 @@ flagsChanged(NSView<PuglGenericView> *self, NSEvent *event)
- (void) keyDown:(NSEvent*)event;
- (void) keyUp:(NSEvent*)event;
- (void) flagsChanged:(NSEvent*)event;
- (void) resizeWithOldSuperviewSize:(NSSize)oldSize;
@end

@implementation PuglCairoView
@@ -749,6 +766,22 @@ flagsChanged(NSView<PuglGenericView> *self, NSEvent *event)
{
flagsChanged(self, event);
}

- (void) resizeWithOldSuperviewSize:(NSSize)oldSize
{
PuglView *pv = self->puglview;

if (pv->width <= 1 && pv->height <= 1)
{
/* NOTE: if the view size was not initialized yet, don't perform an
autoresize; it fixes manual resizing in Reaper.
*/
return;
}

[super resizeWithOldSuperviewSize:oldSize];
}

@end
#endif



+ 2
- 0
distrho/src/DistrhoPluginLV2export.cpp View File

@@ -136,6 +136,7 @@ static const char* const lv2ManifestUiOptionalFeatures[] =
# if !DISTRHO_UI_USER_RESIZABLE
"ui:noUserResize",
# endif
"ui:parent",
"ui:resize",
"ui:touch",
#endif
@@ -145,6 +146,7 @@ static const char* const lv2ManifestUiOptionalFeatures[] =
static const char* const lv2ManifestUiRequiredFeatures[] =
{
"opts:options",
"ui:idleInterface",
#if DISTRHO_PLUGIN_WANT_DIRECT_ACCESS
LV2_DATA_ACCESS_URI,
LV2_INSTANCE_ACCESS_URI,


Loading…
Cancel
Save