Changeset 09539802dc311c3fc03d551f14627a25f8066359

Timestamp:

28/01/07 21:37:21 (2 years ago)

Author:

Olivier Teulière <ipkiss@videolan.org>

git-committer:

Olivier Teulière <ipkiss@videolan.org> 1170016641 +0000

git-parent:

[618352d27ca9ddf5a86f667b7654e2b87bf36576]

git-author:

Olivier Teulière <ipkiss@videolan.org> 1170016641 +0000

Message:

• skins2:
  
  • new WindowID.maximize() and WindowID.unmaximize() actions
    
  • new WindowID.isMaximized boolean variable
    
  • doc updated
    

Files:

• doc/skins/skins2-howto.xml (modified) (2 diffs)
• modules/gui/skins2/commands/cmd_minimize.cpp (modified) (3 diffs)
• modules/gui/skins2/commands/cmd_minimize.hpp (modified) (1 diff)
• modules/gui/skins2/parser/interpreter.cpp (modified) (3 diffs)
• modules/gui/skins2/src/generic_window.cpp (modified) (1 diff)
• modules/gui/skins2/src/top_window.cpp (modified) (1 diff)
• modules/gui/skins2/src/top_window.hpp (modified) (3 diffs)
• modules/gui/skins2/src/window_manager.cpp (modified) (2 diffs)
• modules/gui/skins2/src/window_manager.hpp (modified) (4 diffs)
• modules/gui/skins2/utils/position.hpp (modified) (1 diff)

doc/skins/skins2-howto.xml

@@ -997 +997 @@
-  </para></listitem>
-  <listitem><para>
+    <emphasis>WindowID.maximize()</emphasis>: Maximize the <link linkend="Window">Window</link> whose <link linkend="windowid">id</link> attribute is 'WindowID'. Since VLC 0.9.0.
+  </para></listitem>
+  <listitem><para>
+    <emphasis>WindowID.unmaximize()</emphasis>: Unmaximize the <link linkend="Window">Window</link> whose <link linkend="windowid">id</link> attribute is 'WindowID'. Since VLC 0.9.0.
+  </para></listitem>
+  <listitem><para>
-    <emphasis>WindowID.setLayout(LayoutID)</emphasis>: Change the layout of the <link linkend="Window">Window</link> whose <link linkend="windowid">id</link> attribute is 'WindowID', using the <link linkend="Layout">Layout</link> whose <link linkend="layoutid">id</link> attribute is 'LayoutID'.
-  </para></listitem>
@@ -1097 +1103 @@
-  <listitem><para>
-   <emphasis>dvd.isActive</emphasis>: True when a DVD is currently playing. This variable can be used to display buttons associated to the <link linkend="dvdactions">dvd.* actions</link> only when needed (since VLC 0.8.5).
+  </para></listitem>
+  <listitem><para>
+    <emphasis>WindowID.isMaximized</emphasis>: True when the window whose <link linkend="windowid">id</link> is "WindowID" is maximized, false otherwise.
-  </para></listitem>
-  <listitem><para>

modules/gui/skins2/commands/cmd_minimize.cpp

@@ -6 +6 @@
- *
- * Authors: Mohammed Adnène Trojette     <adn@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -23 +24 @@
-
-#include "cmd_minimize.hpp"
+#include "../src/window_manager.hpp"
-#include "../src/os_factory.hpp"
-
@@ -39 +41 @@
-    OSFactory *pOsFactory = OSFactory::instance( getIntf() );
-    pOsFactory->restore();
+}
+
+
+CmdMaximize::CmdMaximize( intf_thread_t *pIntf,
+                          WindowManager &rWindowManager,
+                          TopWindow &rWindow ):
+    CmdGeneric( pIntf ), m_rWindowManager( rWindowManager ),
+    m_rWindow( rWindow )
+{
+}
+
+
+void CmdMaximize::execute()
+{
+    // Simply delegate the job to the WindowManager
+    m_rWindowManager.maximize( m_rWindow );
+}
+
+
+CmdUnmaximize::CmdUnmaximize( intf_thread_t *pIntf,
+                              WindowManager &rWindowManager,
+                              TopWindow &rWindow ):
+    CmdGeneric( pIntf ), m_rWindowManager( rWindowManager ),
+    m_rWindow( rWindow )
+{
+}
+
+
+void CmdUnmaximize::execute()
+{
+    // Simply delegate the job to the WindowManager
+    m_rWindowManager.unmaximize( m_rWindow );
-}
-

modules/gui/skins2/commands/cmd_minimize.hpp

@@ -27 +27 @@
-#include "cmd_generic.hpp"
-
+class WindowManager;
+class TopWindow;
+
-
-DEFINE_COMMAND(Minimize, "minimize" )
-DEFINE_COMMAND(Restore, "restore" )
+
+/// Command to maximize a window
+class CmdMaximize: public CmdGeneric
+{
+    public:
+        /// Maximize the given layout
+        CmdMaximize( intf_thread_t *pIntf, WindowManager &rWindowManager,
+                     TopWindow &rWindow );
+        virtual ~CmdMaximize() {}
+
+        /// This method does the real job of the command
+        virtual void execute();
+
+        /// Return the type of the command
+        virtual string getType() const { return "maximize"; }
+
+    private:
+        WindowManager &m_rWindowManager;
+        TopWindow &m_rWindow;
+};
+
+
+/// Command to unmaximize a window
+class CmdUnmaximize: public CmdGeneric
+{
+    public:
+        /// Unmaximize the given layout
+        CmdUnmaximize( intf_thread_t *pIntf, WindowManager &rWindowManager,
+                     TopWindow &rWindow );
+        virtual ~CmdUnmaximize() {}
+
+        /// This method does the real job of the command
+        virtual void execute();
+
+        /// Return the type of the command
+        virtual string getType() const { return "unmaximize"; }
+
+    private:
+        WindowManager &m_rWindowManager;
+        TopWindow &m_rWindow;
+};
+
+
-DEFINE_COMMAND(AddInTray, "add in tray" )
-DEFINE_COMMAND(RemoveFromTray, "remove from tray" )

modules/gui/skins2/parser/interpreter.cpp

@@ -226 +226 @@
-        }
-    }
+    else if( rAction.find( ".maximize()" ) != string::npos )
+    {
+        int leftPos = rAction.find( ".maximize()" );
+        string windowId = rAction.substr( 0, leftPos );
+
+        TopWindow *pWin = pTheme->getWindowById( windowId );
+        if( !pWin )
+        {
+            msg_Err( getIntf(), "unknown window (%s)", windowId.c_str() );
+        }
+        else
+        {
+            pCommand = new CmdMaximize( getIntf(),
+                                        pTheme->getWindowManager(),
+                                        *pWin );
+        }
+    }
+    else if( rAction.find( ".unmaximize()" ) != string::npos )
+    {
+        int leftPos = rAction.find( ".unmaximize()" );
+        string windowId = rAction.substr( 0, leftPos );
+
+        TopWindow *pWin = pTheme->getWindowById( windowId );
+        if( !pWin )
+        {
+            msg_Err( getIntf(), "unknown window (%s)", windowId.c_str() );
+        }
+        else
+        {
+            pCommand = new CmdUnmaximize( getIntf(),
+                                          pTheme->getWindowManager(),
+                                          *pWin );
+        }
+    }
-    else if( rAction.find( ".show()" ) != string::npos )
-    {
@@ -421 +455 @@
-                else
-                {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    return NULL;
-                }
@@ -437 +489 @@
-                else
-                {
-
+
+
-                    return NULL;
-                }

modules/gui/skins2/src/generic_window.cpp

@@ -130 +130 @@
-void GenericWindow::onUpdate( Subject<VarBool> &rVariable, void*arg )
-{
-( m_pVarVisible->get()
+ (&rVariable == m_pVarVisible
-    {
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-}

modules/gui/skins2/src/top_window.cpp

@@ -59 +59 @@
-    // Register as a moving window
-    m_rWindowManager.registerWindow( *this );
+
+    // Create the "maximized" variable and register it in the manager
+    m_pVarMaximized = new VarBoolImpl( pIntf );
+    VarManager::instance( pIntf )->registerVar( VariablePtr( m_pVarMaximized ) );
-}
-

modules/gui/skins2/src/top_window.hpp

@@ -79 +79 @@
-        virtual void onTooltipChange( const CtrlGeneric &rCtrl );
-
+        /// Get the "maximized" variable
+        VarBool &getMaximizedVar() { return *m_pVarMaximized; }
+
-        /// Get the initial visibility status
-        bool isVisible() const { return m_visible; }
@@ -90 +93 @@
-
-    private:
+        /**
+         * These methods are only used by the window manager
+         */
+        //@{
-        /// Change the active layout
-        virtual void setActiveLayout( GenericLayout *pLayout );
+        //@}
-
-        /// Initial visibility status
@@ -108 +116 @@
-        int m_currModifier;
-
-
-
+
+
+
+
+
+
+
-        CtrlGeneric *findHitControl( int xPos, int yPos );
-
-
-
+
+
+
+
-        void setLastHit( CtrlGeneric *pNewHitControl );
-};

modules/gui/skins2/src/window_manager.cpp

@@ -30 +30 @@
-#include "tooltip.hpp"
-#include "var_manager.hpp"
-#include "../utils/position.hpp"
-
-
-WindowManager::WindowManager( intf_thread_t *pIntf ):
-    SkinObject( pIntf ), m_magnet( 0 ), m_direction( kNone ),
+    m_maximizeRect(0, 0, 50, 50),
-    m_pTooltip( NULL ), m_pPopup( NULL )
-{
@@ -318 +318 @@
-
-
+void WindowManager::maximize( TopWindow &rWindow )
+{
+    // Save the current position/size of the window, to be able to restore it
+    m_maximizeRect = Rect( rWindow.getLeft(), rWindow.getTop(),
+                           rWindow.getLeft() + rWindow.getWidth(),
+                           rWindow.getTop() + rWindow.getHeight() );
+
+    Rect workArea = OSFactory::instance( getIntf() )->getWorkArea();
+    // Move the window
+    startMove( rWindow );
+    move( rWindow, workArea.getLeft(), workArea.getTop() );
+    stopMove();
+    // Now resize it
+    // FIXME: Ugly const_cast
+    GenericLayout &rLayout = (GenericLayout&)rWindow.getActiveLayout();
+    startResize( rLayout, kResizeSE );
+    resize( rLayout, workArea.getWidth(), workArea.getHeight() );
+    stopResize();
+    rWindow.m_pVarMaximized->set( true );
+
+    // Make the window unmovable by unregistering it
+//     unregisterWindow( rWindow );
+}
+
+
+void WindowManager::unmaximize( TopWindow &rWindow )
+{
+    // Register the window to allow moving it
+//     registerWindow( rWindow );
+
+    // Resize the window
+    // FIXME: Ugly const_cast
+    GenericLayout &rLayout = (GenericLayout&)rWindow.getActiveLayout();
+    startResize( rLayout, kResizeSE );
+    resize( rLayout, m_maximizeRect.getWidth(), m_maximizeRect.getHeight() );
+    stopResize();
+    // Now move it
+    startMove( rWindow );
+    move( rWindow, m_maximizeRect.getLeft(), m_maximizeRect.getTop() );
+    stopMove();
+    rWindow.m_pVarMaximized->set( false );
+}
+
+
-void WindowManager::synchVisibility() const
-{

modules/gui/skins2/src/window_manager.hpp

@@ -28 +28 @@
-#include "skin_common.hpp"
-#include "top_window.hpp"
+#include "../utils/position.hpp"
-#include <list>
-#include <map>
@@ -89 +90 @@
-
-        /**
-Window window
+Layout layout
-         * anchored windows, if some anchors are moved during the resizing.
-         * If a new anchoring is detected, the windows will move (or resize)
@@ -95 +96 @@
-         */
-        void resize( GenericLayout &rLayout, int width, int height ) const;
+
+        /// Maximize the given window
+        void maximize( TopWindow &rWindow );
+
+        /// Unmaximize the given window
+        void unmaximize( TopWindow &rWindow );
-
-        /// Raise all the registered windows
@@ -202 +209 @@
-        /// Direction of the current resizing
-        Direction_t m_direction;
+        /// Rect of the last maximized window
+        Rect m_maximizeRect;
-        /// Tooltip
-        Tooltip *m_pTooltip;

modules/gui/skins2/utils/position.hpp

@@ -60 +60 @@
-        virtual int getLeft() const { return m_left; }
-        virtual int getTop() const { return m_top; }
+        virtual int getRight() const { return m_right; }
+        virtual int getBottom() const { return m_bottom; }
-        virtual int getWidth() const { return m_right - m_left; }
-        virtual int getHeight() const { return m_bottom - m_top; }