Changeset 28bd3a4a6af005742657f8a0ea7fa92a4fef0618

Timestamp:

05/15/06 00:16:59 (2 years ago)

Author:

Olivier Teulière <ipkiss@videolan.org>

git-committer:

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

git-parent:

[ccf834a51a5ba339dff515333118635aaa3b9047]

git-author:

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

Message:

• skins2: new LayoutID.isActive boolean variable
  

Files:

• doc/skins/skins2-howto.xml (modified) (3 diffs)
• modules/gui/skins2/parser/interpreter.cpp (modified) (2 diffs)
• modules/gui/skins2/src/generic_layout.cpp (modified) (3 diffs)
• modules/gui/skins2/src/generic_layout.hpp (modified) (3 diffs)
• modules/gui/skins2/src/top_window.cpp (modified) (2 diffs)

doc/skins/skins2-howto.xml

@@ -315 +315 @@
-  <title>Layout</title>
-  <para>A layout is one aspect of a window, i.e. a set of controls and anchors. A window can have many layouts, but only one will be visible at any time.</para>
+  <sect4 id="layoutid">
+    <title>id</title>
+    <para>Name of the layout (it may be used for actions). Two layouts cannot have the same id.</para>
+    <para>Default value: none</para>
+  </sect4>
-  <sect4 id="layoutwidth">
-    <title>width</title>
@@ -922 +927 @@
-  </para></listitem>
-  <listitem><para>
-attr
+layout
-  </para></listitem>
-</itemizedlist>
@@ -1024 +1029 @@
-  </para></listitem>
-  <listitem><para>
-
+
+
+
+
-  </para></listitem>
-</itemizedlist>

modules/gui/skins2/parser/interpreter.cpp

@@ -402 +402 @@
-            if( pWin )
-            {
-
+to
-                varStack.push_back( &pWin->getVisibleVar() );
-            }
@@ -408 +408 @@
-            {
-                msg_Err( getIntf(), "unknown window (%s)", windowId.c_str() );
+                return NULL;
+            }
+        }
+        else if( token.find( ".isActive" ) != string::npos )
+        {
+            int leftPos = token.find( ".isActive" );
+            string layoutId = token.substr( 0, leftPos );
+            GenericLayout *pLayout = pTheme->getLayoutById( layoutId );
+            if( pLayout )
+            {
+                // Push the isActive variable onto the stack
+                varStack.push_back( &pLayout->getActiveVar() );
+            }
+            else
+            {
+                msg_Err( getIntf(), "unknown layout (%s)", layoutId.c_str() );
-                return NULL;
-            }

modules/gui/skins2/src/generic_layout.cpp

@@ -27 +27 @@
-#include "os_factory.hpp"
-#include "os_graphics.hpp"
+#include "var_manager.hpp"
-#include "../controls/ctrl_generic.hpp"
-#include "../controls/ctrl_video.hpp"
+#include "../utils/var_bool.hpp"
-
-
@@ -37 +39 @@
-    m_height( height ), m_minWidth( minWidth ), m_maxWidth( maxWidth ),
-    m_minHeight( minHeight ), m_maxHeight( maxHeight ), m_pVideoControl( NULL ),
-
+, m_pVarActive( NULL )
-{
-    // Get the OSFactory
@@ -43 +45 @@
-    // Create the graphics buffer
-    m_pImage = pOsFactory->createOSGraphics( width, height );
+
+    // Create the "active layout" variable and register it in the manager
+    m_pVarActive = new VarBoolImpl( pIntf );
+    VarManager::instance( pIntf )->registerVar( VariablePtr( m_pVarActive ) );
-}
-

modules/gui/skins2/src/generic_layout.hpp

@@ -37 +37 @@
-class CtrlGeneric;
-class CtrlVideo;
+class VarBoolImpl;
-
-
@@ -129 +130 @@
-        virtual void onHide();
-
+        /// Give access to the "active layout" variable
+        // FIXME: we give read/write access
+        VarBoolImpl &getActiveVar() { return *m_pVarActive; }
+
-    private:
-        /// Parent window of the layout
@@ -146 +151 @@
-        /// Flag to know if the layout is visible
-        bool m_visible;
+        /// Variable for the "active state" of the layout
+        /**
+         * Note: the layout is not an observer on this variable, because it
+         * cannot be changed externally (i.e. without an explicit change of
+         * layout). This way, we avoid using a setActiveLayoutInner method.
+         */
+        mutable VarBoolImpl *m_pVarActive;
-};
-

modules/gui/skins2/src/top_window.cpp

@@ -324 +324 @@
-{
-    bool isVisible = getVisibleVar().get();
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -339 +344 @@
-        pLayout->onShow();
-    }
+
+    // The new layout is active
+    pLayout->getActiveVar().set( true );
-}
-