[vlc-commits] macosx: fixed border styles of playlist table and sidebar when using the gray main window style (finally fixes #5742)

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Jan  6 20:03:12 2012 +0100| [1124bc639e71835d7dd173314bb8b48bace35857] | committer: Jean-Baptiste Kempf

macosx: fixed border styles of playlist table and sidebar when using the gray main window style (finally fixes #5742)
(cherry picked from commit 7d62684674a61043f649034eec5244ca92328c61)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=1124bc639e71835d7dd173314bb8b48bace35857
---

 .../macosx/Resources/English.lproj/MainMenu.xib    |   31 ++++++++++++++-----
 modules/gui/macosx/MainWindow.h                    |    1 +
 modules/gui/macosx/MainWindow.m                    |    4 ++
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index a77fba6..ed7af21 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -22,14 +22,14 @@
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
       <integer value="4722"/>
-      <integer value="1617"/>
-      <integer value="283"/>
-      <integer value="4682"/>
       <integer value="29"/>
-      <integer value="915"/>
-      <integer value="2730"/>
+      <integer value="1617"/>
       <integer value="4596"/>
+      <integer value="2730"/>
       <integer value="4895"/>
+      <integer value="21"/>
+      <integer value="915"/>
+      <integer value="283"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -7377,6 +7377,14 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">4924</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">o_sidebar_scrollview</string>
+            <reference key="source" ref="498338108"/>
+            <reference key="destination" ref="979766179"/>
+          </object>
+          <int key="connectionID">4925</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -11113,9 +11121,9 @@ LCAuLi4</string>
           <string>{{430, 565}, {137, 103}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{329, 81}, {604, 310}}</string>
+          <string>{{1017, 498}, {604, 310}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{329, 81}, {604, 310}}</string>
+          <string>{{1017, 498}, {604, 310}}</string>
           <boolean value="YES"/>
           <boolean value="NO"/>
           <boolean value="YES"/>
@@ -11785,7 +11793,7 @@ LCAuLi4</string>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">4924</int>
+      <int key="maxID">4925</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -16379,6 +16387,7 @@ LCAuLi4</string>
               <string>o_right_split_view</string>
               <string>o_search_fld</string>
               <string>o_shuffle_btn</string>
+              <string>o_sidebar_scrollview</string>
               <string>o_sidebar_view</string>
               <string>o_split_view</string>
               <string>o_stop_btn</string>
@@ -16428,6 +16437,7 @@ LCAuLi4</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
+              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -16454,6 +16464,7 @@ LCAuLi4</string>
               <string>o_right_split_view</string>
               <string>o_search_fld</string>
               <string>o_shuffle_btn</string>
+              <string>o_sidebar_scrollview</string>
               <string>o_sidebar_view</string>
               <string>o_split_view</string>
               <string>o_stop_btn</string>
@@ -16551,6 +16562,10 @@ LCAuLi4</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBToOneOutletInfo">
+                <string key="name">o_sidebar_scrollview</string>
+                <string key="candidateClassName">id</string>
+              </object>
+              <object class="IBToOneOutletInfo">
                 <string key="name">o_sidebar_view</string>
                 <string key="candidateClassName">id</string>
               </object>
diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index c3e24d7..8d6a863 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -58,6 +58,7 @@
     IBOutlet id o_left_split_view;
     IBOutlet id o_right_split_view;
     IBOutlet id o_sidebar_view;
+    IBOutlet id o_sidebar_scrollview;
     IBOutlet id o_chosen_category_lbl;
 
     IBOutlet id o_dropzone_view;
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index a0d2fc1..d2d1925 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -415,7 +415,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
         [self display];
     }
     else
+    {
         [o_video_view setFrame: [o_split_view frame]];
+        [o_playlist_table setBorderType: NSNoBorder];
+        [o_sidebar_scrollview setBorderType: NSNoBorder];
+    }
 
     if (OSX_LION)
         [o_resize_view setImage: NULL];