Changeset 44c6d658c95fc55d3f7a9129f9dea42ee1bdf067

Timestamp:

04/12/05 16:31:14 (3 years ago)

Author:

Benjamin Pracht <bigben@videolan.org>

git-committer:

Benjamin Pracht <bigben@videolan.org> 1113316274 +0000

git-parent:

[2d55c0f1a446fb43908664f79e273ca7e200e898]

git-author:

Benjamin Pracht <bigben@videolan.org> 1113316274 +0000

Message:

* intf.* : try to restore an a bit more intelligent behavior for the playlist toggle button (remeber previous state, for instance)
* misc.* : get rid of unused code.

Files:

• modules/gui/macosx/intf.h (modified) (1 diff)
• modules/gui/macosx/intf.m (modified) (4 diffs)
• modules/gui/macosx/misc.h (modified) (1 diff)
• modules/gui/macosx/misc.m (modified) (2 diffs)

modules/gui/macosx/intf.h

@@ -235 +235 @@
-    IBOutlet id o_dmi_previous;
-    IBOutlet id o_dmi_mute;
-
+
-    bool b_small_window;
-
+
-    mtime_t i_end_scroll;
+
+    NSSize o_size_with_playlist;
+
-}
-

modules/gui/macosx/intf.m

@@ -398 +398 @@
-    [self updateTogglePlaylistState];
-
+    o_size_with_playlist = [o_window frame].size;
+
-    p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-
@@ -1517 +1519 @@
-        b_small_window = YES; /* we know we are small, make sure this is actually set (see case below) */
-        /* make large */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        o_rect.origin.x = [o_window frame].origin.x;
-        o_rect.origin.y = [o_window frame].origin.y - o_rect.size.height +
@@ -1532 +1547 @@
-        o_rect.origin.y = [o_window frame].origin.y +
-            [o_window frame].size.height - [o_window minSize].height;
-
+
-        [o_playlist_view setAutoresizesSubviews: NO];
-        [o_playlist_view removeFromSuperview];
@@ -1557 +1572 @@
-{
-    /* Not triggered on a window resize or maxification of the window. only by window mouse dragging resize */
+
+   /*Stores the size the controller one resize, to be able to restore it when
+     toggling the playlist*/
+    o_size_with_playlist = proposedFrameSize;
+
-    if( proposedFrameSize.height <= 200 )
-    {

modules/gui/macosx/misc.h

@@ -26 +26 @@
- *****************************************************************************/
-
+
-@interface VLCControllerWindow : NSWindow
-{
-    NSSize o_size_with_playlist;
-}
-
-- (NSSize)getSizeWithPlaylist;
-
-@end

modules/gui/macosx/misc.m

@@ -40 +40 @@
-    backing:backingType defer:flag];
-
-    o_size_with_playlist = [self frame].size;
-
-    [[VLCMain sharedInstance] updateTogglePlaylistState];
-
@@ -50 +48 @@
-{
-    return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event];
-}
-
-/*Stores the size the controller one resize, to be able to restore it when
-  toggling the playlist*/
-
-- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
-{
-    o_size_with_playlist = proposedFrameSize;
-
-    /*Callback to update the state of Playlist Toggle Button*/
-    [[VLCMain sharedInstance] updateTogglePlaylistState];
-
-    return proposedFrameSize;
-}
-
-- (NSSize)getSizeWithPlaylist
-{
-    return o_size_with_playlist;
-}
-