macosx dialog provider: use default system font for the scripted dialogs

[vlc] / modules / gui / macosx_dialog_provider / dialogProvider.m

diff --git a/modules/gui/macosx_dialog_provider/dialogProvider.m b/modules/gui/macosx_dialog_provider/dialogProvider.m
index 0f31fd21cbf4074d5aade8dbcec21fe304c474d7..0cee15ae6eac7f66907eb2e31db834b6cf54eb38 100644 (file)
--- a/modules/gui/macosx_dialog_provider/dialogProvider.m
+++ b/modules/gui/macosx_dialog_provider/dialogProvider.m
@@ -917,7 +917,7 @@ bool checkProgressPanel (void *priv)
 {
     NSView *contentView = [sender contentView];
     assert([contentView isKindOfClass:[VLCDialogGridView class]]);
-    VLCDialogGridView *gridView = contentView;
+    VLCDialogGridView *gridView = (VLCDialogGridView *)contentView;
 
     NSRect rect = NSMakeRect(0, 0, 0, 0);
     rect.size = frameSize;
@@ -964,6 +964,7 @@ static NSView *createControlFromWidget(extension_widget_t *widget, id self)
             [field setEditable:NO];
             [field setBordered:NO];
             [field setDrawsBackground:NO];
+            [field setFont:[NSFont systemFontOfSize:0]];
             [[field cell] setControlSize:NSRegularControlSize];
             [field setAutoresizingMask:NSViewNotSizable];
             return field;
@@ -973,6 +974,7 @@ static NSView *createControlFromWidget(extension_widget_t *widget, id self)
             VLCDialogTextField *field = [[VLCDialogTextField alloc] init];
             [field setWidget:widget];
             [field setAutoresizingMask:NSViewWidthSizable];
+            [field setFont:[NSFont systemFontOfSize:0]];
             [[field cell] setControlSize:NSRegularControlSize];
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncTextField:)  name:NSControlTextDidChangeNotification object:field];
             return field;
@@ -1030,7 +1032,7 @@ static NSView *createControlFromWidget(extension_widget_t *widget, id self)
 
 }
 
-static void updateControlFromWidget(NSView *control, extension_widget_t *widget)
+static void updateControlFromWidget(NSView *control, extension_widget_t *widget, id self)
 {
     switch (widget->type)
     {
@@ -1099,6 +1101,7 @@ static void updateControlFromWidget(NSView *control, extension_widget_t *widget)
                 [popup addItemWithTitle:[NSString stringWithUTF8String:value->psz_text]];
             }
             [popup synchronizeTitleAndSelectedItem];
+            [self popUpSelectionChanged:popup];
             break;
         }
 
@@ -1157,7 +1160,7 @@ static void updateControlFromWidget(NSView *control, extension_widget_t *widget)
         if (!control && !shouldDestroy)
         {
             control = createControlFromWidget(widget, self);
-            updateControlFromWidget(control, widget);
+            updateControlFromWidget(control, widget, self);
             widget->p_sys_intf = control;
             update = YES; // Force update and repositionning
             [control setHidden:widget->b_hide];
@@ -1165,7 +1168,7 @@ static void updateControlFromWidget(NSView *control, extension_widget_t *widget)
 
         if (update && !shouldDestroy)
         {
-            updateControlFromWidget(control, widget);
+            updateControlFromWidget(control, widget, self);
             [control setHidden:widget->b_hide];
 
             int row = widget->i_row - 1;