macosx: implemented the logo and marquee filters in the video filters panel,...

macosx: implemented the logo and marquee filters in the video filters panel, optimized the code a bit (fixes #5118)
(cherry picked from commit 2be0e49f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/gui/macosx/VideoEffects.h

@@ -113,9 +113,6 @@
     IBOutlet id o_psychedelic_ckb;
 
     /* misc */
-    IBOutlet id o_clone_ckb;
-    IBOutlet id o_clone_lbl;
-    IBOutlet id o_clone_fld;
     IBOutlet id o_addtext_ckb;
     IBOutlet id o_addtext_text_fld;
     IBOutlet id o_addtext_text_lbl;
@@ -124,10 +121,8 @@
     IBOutlet id o_addlogo_ckb;
     IBOutlet id o_addlogo_logo_lbl;
     IBOutlet id o_addlogo_logo_fld;
-    IBOutlet id o_addlogo_top_lbl;
-    IBOutlet id o_addlogo_top_fld;
-    IBOutlet id o_addlogo_left_lbl;
-    IBOutlet id o_addlogo_left_fld;
+    IBOutlet id o_addlogo_pos_lbl;
+    IBOutlet id o_addlogo_pos_pop;
     IBOutlet id o_addlogo_transparency_lbl;
     IBOutlet id o_addlogo_transparency_sld;
 }
@@ -184,8 +179,6 @@
 - (IBAction)enablePsychedelic:(id)sender;
 
 /* miscellaneous */
-- (IBAction)enableClone:(id)sender;
-- (IBAction)cloneModifierChanged:(id)sender;
 - (IBAction)enableAddText:(id)sender;
 - (IBAction)addTextModifierChanged:(id)sender;
 - (IBAction)enableAddLogo:(id)sender;

modules/gui/macosx/misc.m

@@ -726,9 +726,9 @@ void _drawFrameInRect(NSRect frameRect)
     leftViewDimensions.size.height = viewDimensions.size.height;
     [[o_subviews objectAtIndex:0] setFrame: leftViewDimensions];
 
+    rightViewDimensions.origin.x = leftViewDimensions.size.width + f_dividerThickness;
     rightViewDimensions.size.width = viewDimensions.size.width - leftViewDimensions.size.width - f_dividerThickness;
     rightViewDimensions.size.height = viewDimensions.size.height;
-    rightViewDimensions.origin.x = leftViewDimensions.size.width + f_dividerThickness;
     [[o_subviews objectAtIndex:1] setFrame: rightViewDimensions];
 }
 @end