mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 14:54:56 +01:00
update AU GUI positioning and resizing.
This commit is contained in:
Robin Gareus
parent
8d46cc99fe
commit
5eefdf7536
2 changed files with 218 additions and 140 deletions
|
|
@ -71,8 +71,8 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>);
|
||||
~AUPluginUI ();
|
||||
|
||||
gint get_preferred_height () { return prefheight; }
|
||||
gint get_preferred_width () { return prefwidth; }
|
||||
gint get_preferred_width () { return req_width; }
|
||||
gint get_preferred_height () { return req_height; }
|
||||
bool start_updating(GdkEventAny*);
|
||||
bool stop_updating(GdkEventAny*);
|
||||
|
||||
|
|
@ -84,6 +84,12 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
void lower_box_realized ();
|
||||
bool lower_box_visibility_notify (GdkEventVisibility*);
|
||||
|
||||
void lower_box_map ();
|
||||
void lower_box_unmap ();
|
||||
void lower_box_size_request (GtkRequisition*);
|
||||
void lower_box_size_allocate (Gtk::Allocation&);
|
||||
gboolean lower_box_expose (GdkEventExpose*);
|
||||
|
||||
void cocoa_view_resized ();
|
||||
void on_realize ();
|
||||
void grab_focus();
|
||||
|
|
@ -109,6 +115,15 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
|
||||
static std::vector<std::string> automation_mode_strings;
|
||||
|
||||
bool mapped;
|
||||
bool resizable;
|
||||
int min_width;
|
||||
int min_height;
|
||||
int req_width;
|
||||
int req_height;
|
||||
int alo_width;
|
||||
int alo_height;
|
||||
|
||||
/* Cocoa */
|
||||
|
||||
NSWindow* cocoa_window;
|
||||
|
|
@ -134,6 +149,8 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
int parent_cocoa_window ();
|
||||
NSWindow* get_nswindow();
|
||||
|
||||
void update_view_size ();
|
||||
|
||||
bool plugin_class_valid (Class pluginClass);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ static const gchar* _automation_mode_strings[] = {
|
|||
};
|
||||
|
||||
static void
|
||||
dump_view_tree (NSView* view, int depth)
|
||||
dump_view_tree (NSView* view, int depth, int maxdepth)
|
||||
{
|
||||
NSArray* subviews = [view subviews];
|
||||
unsigned long cnt = [subviews count];
|
||||
|
|
@ -56,14 +56,17 @@ dump_view_tree (NSView* view, int depth)
|
|||
for (int d = 0; d < depth; d++) {
|
||||
cerr << '\t';
|
||||
}
|
||||
NSRect frame = [view frame];
|
||||
NSRect frame = [view frame];
|
||||
cerr << " view @ " << frame.origin.x << ", " << frame.origin.y
|
||||
<< ' ' << frame.size.width << " x " << frame.size.height
|
||||
<< endl;
|
||||
<< ' ' << frame.size.width << " x " << frame.size.height
|
||||
<< endl;
|
||||
|
||||
if (depth >= maxdepth) {
|
||||
return;
|
||||
}
|
||||
for (unsigned long i = 0; i < cnt; ++i) {
|
||||
NSView* subview = [subviews objectAtIndex:i];
|
||||
dump_view_tree (subview, depth+1);
|
||||
dump_view_tree (subview, depth+1, maxdepth);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -77,20 +80,22 @@ dump_view_tree (NSView* view, int depth)
|
|||
plugin_ui = apluginui;
|
||||
top_level_parent = tlp;
|
||||
|
||||
if (cp) {
|
||||
cocoa_parent = cp;
|
||||
if (cp) {
|
||||
cocoa_parent = cp;
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(cocoaParentActivationHandler:)
|
||||
name:NSWindowDidBecomeMainNotification
|
||||
object:NULL];
|
||||
[[NSNotificationCenter defaultCenter]
|
||||
addObserver:self
|
||||
selector:@selector(cocoaParentActivationHandler:)
|
||||
name:NSWindowDidBecomeMainNotification
|
||||
object:NULL];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(cocoaParentBecameKeyHandler:)
|
||||
name:NSWindowDidBecomeKeyNotification
|
||||
object:NULL];
|
||||
}
|
||||
}
|
||||
[[NSNotificationCenter defaultCenter]
|
||||
addObserver:self
|
||||
selector:@selector(cocoaParentBecameKeyHandler:)
|
||||
name:NSWindowDidBecomeKeyNotification
|
||||
object:NULL];
|
||||
}
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
|
@ -123,7 +128,7 @@ dump_view_tree (NSView* view, int depth)
|
|||
|
||||
- (void)auViewResized:(NSNotification *)notification
|
||||
{
|
||||
(void) notification; // stop complaints about unusued argument
|
||||
(void) notification; // stop complaints about unusued argument
|
||||
plugin_ui->cocoa_view_resized();
|
||||
}
|
||||
|
||||
|
|
@ -133,6 +138,14 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
|
|||
: PlugUIBase (insert)
|
||||
, automation_mode_label (_("Automation"))
|
||||
, preset_label (_("Presets"))
|
||||
, mapped (false)
|
||||
, resizable (false)
|
||||
, min_width (0)
|
||||
, min_height (0)
|
||||
, req_width (0)
|
||||
, req_height (0)
|
||||
, alo_width (0)
|
||||
, alo_height (0)
|
||||
|
||||
{
|
||||
if (automation_mode_strings.empty()) {
|
||||
|
|
@ -185,7 +198,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
|
|||
|
||||
set_spacing (6);
|
||||
pack_start (top_box, false, false);
|
||||
pack_start (low_box, false, false);
|
||||
pack_start (low_box, true, true);
|
||||
|
||||
preset_label.show ();
|
||||
_preset_combo.show ();
|
||||
|
|
@ -218,17 +231,22 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
|
|||
create_cocoa_view ();
|
||||
}
|
||||
|
||||
low_box.add_events(Gdk::VISIBILITY_NOTIFY_MASK);
|
||||
low_box.add_events (Gdk::VISIBILITY_NOTIFY_MASK | Gdk::EXPOSURE_MASK);
|
||||
|
||||
low_box.signal_realize().connect (mem_fun (this, &AUPluginUI::lower_box_realized));
|
||||
low_box.signal_visibility_notify_event ().connect (mem_fun (this, &AUPluginUI::lower_box_visibility_notify));
|
||||
low_box.signal_size_request ().connect (mem_fun (this, &AUPluginUI::lower_box_size_request));
|
||||
low_box.signal_size_allocate ().connect (mem_fun (this, &AUPluginUI::lower_box_size_allocate));
|
||||
low_box.signal_map ().connect (mem_fun (this, &AUPluginUI::lower_box_map));
|
||||
low_box.signal_unmap ().connect (mem_fun (this, &AUPluginUI::lower_box_unmap));
|
||||
//low_box.signal_expose_event ().connect (mem_fun (this, &AUPluginUI::lower_box_expose));
|
||||
}
|
||||
|
||||
AUPluginUI::~AUPluginUI ()
|
||||
{
|
||||
if (_notify) {
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:_notify];
|
||||
}
|
||||
if (_notify) {
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:_notify];
|
||||
}
|
||||
|
||||
if (cocoa_parent) {
|
||||
NSWindow* win = get_nswindow();
|
||||
|
|
@ -249,7 +267,7 @@ AUPluginUI::~AUPluginUI ()
|
|||
if (au_view) {
|
||||
/* remove whatever we packed into low_box so that GTK doesn't
|
||||
mess with it.
|
||||
*/
|
||||
*/
|
||||
|
||||
[au_view removeFromSuperview];
|
||||
}
|
||||
|
|
@ -286,7 +304,7 @@ AUPluginUI::test_carbon_view_support ()
|
|||
|
||||
return ret;
|
||||
#else
|
||||
return false;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -429,11 +447,12 @@ AUPluginUI::create_cocoa_view ()
|
|||
}
|
||||
|
||||
// Get the initial size of the new AU View's frame
|
||||
NSRect frame = [au_view frame];
|
||||
min_width = req_width = CGRectGetWidth(NSRectToCGRect(frame));
|
||||
min_height = req_height = CGRectGetHeight(NSRectToCGRect(frame));
|
||||
resizable = [au_view autoresizingMask];
|
||||
|
||||
NSRect rect = [au_view frame];
|
||||
prefheight = rect.size.height;
|
||||
prefwidth = rect.size.width;
|
||||
low_box.set_size_request (rect.size.width, rect.size.height);
|
||||
low_box.queue_resize ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -441,49 +460,23 @@ AUPluginUI::create_cocoa_view ()
|
|||
void
|
||||
AUPluginUI::cocoa_view_resized ()
|
||||
{
|
||||
NSWindow* window = get_nswindow ();
|
||||
NSRect windowFrame= [window frame];
|
||||
NSRect new_frame = [au_view frame];
|
||||
if (!mapped || alo_width == 0 || alo_height == 0 || !resizable) {
|
||||
return;
|
||||
}
|
||||
/* check for self-resizing plugins (e.g expand settings in AUSampler)
|
||||
* if the widget expands it moves its y-offset (cocoa y-axis points towards the top)
|
||||
*/
|
||||
NSRect new_au_frame = [au_view frame];
|
||||
|
||||
float dy = last_au_frame.size.height - new_frame.size.height;
|
||||
float dx = last_au_frame.size.width - new_frame.size.width;
|
||||
//float dx = last_au_frame.origin.x - new_au_frame.origin.x;
|
||||
float dy = last_au_frame.origin.y - new_au_frame.origin.y;
|
||||
//req_width += dx;
|
||||
req_height += dy;
|
||||
if (req_width < min_width) req_width = min_width;
|
||||
if (req_height < min_height) req_height = min_height;
|
||||
|
||||
windowFrame.origin.y += dy;
|
||||
windowFrame.origin.x += dx;
|
||||
windowFrame.size.height -= dy;
|
||||
windowFrame.size.width -= dx;
|
||||
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:_notify
|
||||
name:NSViewFrameDidChangeNotification
|
||||
object:au_view];
|
||||
|
||||
NSUInteger old_auto_resize = [au_view autoresizingMask];
|
||||
|
||||
[au_view setAutoresizingMask:NSViewNotSizable];
|
||||
[window setFrame:windowFrame display:1];
|
||||
|
||||
/* Some stupid AU Views change the origin of the original AU View
|
||||
when they are resized (I'm looking at you AUSampler). If the origin
|
||||
has been moved, move it back.
|
||||
*/
|
||||
|
||||
if (last_au_frame.origin.x != new_frame.origin.x ||
|
||||
last_au_frame.origin.y != new_frame.origin.y) {
|
||||
new_frame.origin = last_au_frame.origin;
|
||||
[au_view setFrame:new_frame];
|
||||
/* also be sure to redraw the topbox because this can
|
||||
also go wrong.
|
||||
*/
|
||||
top_box.queue_draw ();
|
||||
}
|
||||
|
||||
[au_view setAutoresizingMask:old_auto_resize];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:_notify
|
||||
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
|
||||
object:au_view];
|
||||
|
||||
last_au_frame = new_frame;
|
||||
last_au_frame = new_au_frame;
|
||||
low_box.queue_resize ();
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -538,11 +531,11 @@ AUPluginUI::create_carbon_view ()
|
|||
size.x = bounds.right-bounds.left;
|
||||
size.y = bounds.bottom-bounds.top;
|
||||
|
||||
prefwidth = (int) (size.x + 0.5);
|
||||
prefheight = (int) (size.y + 0.5);
|
||||
req_width = (int) (size.x + 0.5);
|
||||
req_height = (int) (size.y + 0.5);
|
||||
|
||||
SizeWindow (carbon_window, prefwidth, prefheight, true);
|
||||
low_box.set_size_request (prefwidth, prefheight);
|
||||
SizeWindow (carbon_window, prefwidth, req_height, true);
|
||||
low_box.set_size_request (prefwidth, req_height); // ??
|
||||
|
||||
return 0;
|
||||
#else
|
||||
|
|
@ -654,37 +647,25 @@ AUPluginUI::parent_cocoa_window ()
|
|||
return -1;
|
||||
}
|
||||
|
||||
[win setAutodisplay:1]; // turn of GTK stuff for this window
|
||||
//[win setAutodisplay:1]; // turn off GTK stuff for this window
|
||||
|
||||
Gtk::Container* toplevel = get_toplevel();
|
||||
NSView* view = gdk_quartz_window_get_nsview (low_box.get_window()->gobj());
|
||||
[view addSubview:au_view];
|
||||
|
||||
if (!toplevel || !toplevel->is_toplevel()) {
|
||||
error << _("AUPluginUI: no top level window!") << endmsg;
|
||||
return -1;
|
||||
}
|
||||
|
||||
NSView* view = gdk_quartz_window_get_nsview (get_toplevel()->get_window()->gobj());
|
||||
GtkRequisition a = top_box.size_request ();
|
||||
|
||||
/* move the au_view down so that it doesn't overlap the top_box contents */
|
||||
|
||||
const int spacing = 6; // main vbox spacing
|
||||
const int pad = 4; // box pad
|
||||
|
||||
NSPoint origin = { spacing + pad, static_cast<CGFloat> (a.height) + (2 * spacing) + pad };
|
||||
|
||||
[au_view setFrameOrigin:origin];
|
||||
[view addSubview:au_view positioned:NSWindowBelow relativeTo:NULL];
|
||||
|
||||
last_au_frame = [au_view frame];
|
||||
gint xx, yy;
|
||||
gtk_widget_translate_coordinates(
|
||||
GTK_WIDGET(low_box.gobj()),
|
||||
GTK_WIDGET(low_box.get_parent()->gobj()),
|
||||
8, 6, &xx, &yy);
|
||||
[au_view setFrame:NSMakeRect(xx, yy, req_width, req_height)];
|
||||
|
||||
last_au_frame = [au_view frame];
|
||||
// watch for size changes of the view
|
||||
|
||||
_notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:_notify
|
||||
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
|
||||
object:au_view];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:_notify
|
||||
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
|
||||
object:au_view];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -754,6 +735,86 @@ AUPluginUI::lower_box_visibility_notify (GdkEventVisibility* ev)
|
|||
return false;
|
||||
}
|
||||
|
||||
void
|
||||
AUPluginUI::update_view_size ()
|
||||
{
|
||||
if (!mapped || alo_width == 0 || alo_height == 0) {
|
||||
return;
|
||||
}
|
||||
gint xx, yy;
|
||||
gtk_widget_translate_coordinates(
|
||||
GTK_WIDGET(low_box.gobj()),
|
||||
GTK_WIDGET(low_box.get_parent()->gobj()),
|
||||
8, 6, &xx, &yy);
|
||||
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:_notify
|
||||
name:NSViewFrameDidChangeNotification
|
||||
object:au_view];
|
||||
|
||||
if (!resizable) {
|
||||
xx += (alo_width - req_width) * .5;
|
||||
[au_view setFrame:NSMakeRect(xx, yy, req_width, req_height)];
|
||||
} else {
|
||||
/* this mitigates issues with plugins that resize themselves
|
||||
* depending on visible options (e.g AUSampler)
|
||||
* since the OSX y-axis points upwards, the plugin adjusts its
|
||||
* own y-offset if the view expands to the bottom to accomodate
|
||||
* subviews inside the main view.
|
||||
*/
|
||||
[au_view setAutoresizesSubviews:0];
|
||||
[au_view setFrame:NSMakeRect(xx, yy, alo_width, alo_height)];
|
||||
[au_view setAutoresizesSubviews:1];
|
||||
[au_view setNeedsDisplay:1];
|
||||
}
|
||||
|
||||
last_au_frame = [au_view frame];
|
||||
|
||||
[[NSNotificationCenter defaultCenter]
|
||||
addObserver:_notify
|
||||
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
|
||||
object:au_view];
|
||||
}
|
||||
|
||||
void
|
||||
AUPluginUI::lower_box_map ()
|
||||
{
|
||||
mapped = true;
|
||||
[au_view setHidden:0];
|
||||
update_view_size ();
|
||||
}
|
||||
|
||||
void
|
||||
AUPluginUI::lower_box_unmap ()
|
||||
{
|
||||
mapped = false;
|
||||
[au_view setHidden:1];
|
||||
}
|
||||
|
||||
void
|
||||
AUPluginUI::lower_box_size_request (GtkRequisition* requisition)
|
||||
{
|
||||
requisition->width = req_width;
|
||||
requisition->height = req_height;
|
||||
}
|
||||
|
||||
void
|
||||
AUPluginUI::lower_box_size_allocate (Gtk::Allocation& allocation)
|
||||
{
|
||||
alo_width = allocation.get_width ();
|
||||
alo_height = allocation.get_height ();
|
||||
update_view_size ();
|
||||
}
|
||||
|
||||
gboolean
|
||||
AUPluginUI::lower_box_expose (GdkEventExpose* event)
|
||||
{
|
||||
[au_view drawRect:NSMakeRect(event->area.x,
|
||||
event->area.y,
|
||||
event->area.width,
|
||||
event->area.height)];
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
AUPluginUI::on_window_hide ()
|
||||
{
|
||||
|
|
@ -766,10 +827,10 @@ AUPluginUI::on_window_hide ()
|
|||
hide_all ();
|
||||
|
||||
#if 0
|
||||
NSArray* wins = [NSApp windows];
|
||||
for (uint32_t i = 0; i < [wins count]; i++) {
|
||||
id win = [wins objectAtIndex:i];
|
||||
}
|
||||
NSArray* wins = [NSApp windows];
|
||||
for (uint32_t i = 0; i < [wins count]; i++) {
|
||||
id win = [wins objectAtIndex:i];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue