Merge pull request #1625 from JimMarlowe/JM-WINDOW-WORK

Add titlebar axis control for UIWindow

Source/Atomic/UI/UIDockWindow.cpp

@@ -117,6 +117,13 @@ bool UIDockWindow::OnEvent(const tb::TBWidgetEvent &ev)
     return UIWidget::OnEvent(ev);
 }
 
+void UIDockWindow::SetAxis(UI_AXIS axis)
+{
+    if (!widget_)
+        return;
+
+    widget_->SetAxis((AXIS) axis);
+}
 
 
 

Source/Atomic/UI/UIDockWindow.h

@@ -50,6 +50,7 @@ class ATOMIC_API UIDockWindow : public UIWindow
     bool HasDockContent();  /// Returns if the UIDockWindow contains docked content.
     void Dock( UIWidget *target );  /// Transfers the dock content to the target widget
     void Show( UIWidget *host, int xpos = 50, int ypos = 50 ); /// Show the UIDockWindow, and optional position
+    void SetAxis(UI_AXIS axis);   /// Axis orientation of titlebar, UI_AXIS_Y = top(default), UI_AXIS_X = left side
 
 protected:
 

Source/Atomic/UI/UIScrollContainer.cpp

@@ -117,4 +117,15 @@ bool UIScrollContainer::OnEvent(const tb::TBWidgetEvent &ev)
     return UIWidget::OnEvent(ev);
 }
 
+
+void UIScrollContainer::AddChild(UIWidget* child)
+{
+    if (!widget_ || !child || !child->GetInternalWidget() )
+        return;
+
+   ((TBScrollContainer*) widget_)->GetContentRoot()->AddChild(child->GetInternalWidget());
+}
+
+
+
 }

Source/Atomic/UI/UIScrollContainer.h

@@ -65,6 +65,8 @@ public:
 
     void ScrollTo(int x, int y);
 
+    /// This is overriden to add children to the widget that is being scrolled rather than the container
+    virtual void AddChild(UIWidget* child);
 
 protected:
 

Source/Atomic/UI/UIWindow.cpp

@@ -104,4 +104,12 @@ bool UIWindow::OnEvent(const tb::TBWidgetEvent &ev)
     return UIWidget::OnEvent(ev);
 }
 
+void UIWindow::SetAxis(UI_AXIS axis)
+{
+    if (!widget_)
+        return;
+
+    widget_->SetAxis((AXIS) axis);
+}
+
 }

Source/Atomic/UI/UIWindow.h

@@ -64,6 +64,8 @@ class ATOMIC_API UIWindow : public UIWidget
     void AddChild(UIWidget *child);
 
     void Close();
+    
+    void SetAxis(UI_AXIS axis);  /// Axis orientation of titlebar, UI_AXIS_Y = top(default), UI_AXIS_X = left side
 
 protected:
 

Source/ThirdParty/TurboBadger/tb_atomic_widgets.cpp

@@ -767,6 +767,8 @@ TBDockWindow::TBDockWindow( TBStr title, TBWidget *contentptr, int minwidth, int
     SetID(TBID(title));
     m_mover.AddChild(&m_redock_button);
     m_redock_button.SetSkinBg(TBIDC("TBWindow.redock"));
+    if ( m_redock_button.GetSkinBgElement() == NULL )
+        m_redock_button.SetSkinBg(TBIDC("arrow.down"));  // fallback skin for editor
     m_redock_button.SetIsFocusable(false);
     m_redock_button.SetID(TBIDC("TBWindow.redock"));
     m_redock_button.SetVisibilility(WIDGET_VISIBILITY_INVISIBLE);
@@ -792,13 +794,21 @@ TBDockWindow::~TBDockWindow()
 
 void TBDockWindow::SetDockOrigin( TBID dockid )
 {
-     m_dockid = dockid;
+    m_dockid = dockid;
     if ( m_dockid > 0 ) //enable/show the (re)dock button is a return id is specified
     {
         m_redock_button.SetVisibilility(WIDGET_VISIBILITY_VISIBLE);
     }
 }
 
+TBWidget *TBDockWindow::GetEventDestination() 
+{ 
+    if ( m_dockid > 0 ) // if the origin is specified, send events back to there while the content is undocked
+    {                   // so the original event handlers will still function.
+        return GetParentRoot(true)->GetWidgetByID(m_dockid);
+    }
+    return GetParent();
+}
 
 void TBDockWindow::Show( TBWidget *host, int xpos, int ypos )
 {
@@ -885,19 +895,37 @@ void TBDockWindow::OnResized(int old_w, int old_h)
     // Manually move our own decoration children
     // FIX: Put a layout in the TBMover so we can add things there nicely.
     int title_height = GetTitleHeight();
-    m_mover.SetRect(TBRect(0, 0, GetRect().w, title_height));
-    PreferredSize ps = m_resizer.GetPreferredSize();
-    m_resizer.SetRect(TBRect(GetRect().w - ps.pref_w, GetRect().h - ps.pref_h, ps.pref_w, ps.pref_h));
-    TBRect mover_rect = m_mover.GetPaddingRect();
-    int button_size = mover_rect.h;
-    m_close_button.SetRect(TBRect(mover_rect.x + mover_rect.w - button_size, mover_rect.y, button_size, button_size));
-    if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
-        mover_rect.w -= button_size;
-    // add redock button to header
-    m_redock_button.SetRect(TBRect(mover_rect.x + mover_rect.w - button_size, mover_rect.y, button_size, button_size));
-    if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
-        mover_rect.w -= button_size;
-    m_textfield.SetRect(mover_rect);
+    if ( m_axis == AXIS_Y )  // default 
+    {
+        m_mover.SetRect(TBRect(0, 0, GetRect().w, title_height));
+        PreferredSize ps = m_resizer.GetPreferredSize();
+        m_resizer.SetRect(TBRect(GetRect().w - ps.pref_w, GetRect().h - ps.pref_h, ps.pref_w, ps.pref_h));
+        TBRect mover_rect = m_mover.GetPaddingRect();
+        int button_size = mover_rect.h;
+        m_close_button.SetRect(TBRect(mover_rect.x + mover_rect.w - button_size, mover_rect.y, button_size, button_size));
+        if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
+            mover_rect.w -= button_size;
+        // add redock button to header
+        m_redock_button.SetRect(TBRect(mover_rect.x + mover_rect.w - button_size, mover_rect.y, button_size, button_size));
+        if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
+            mover_rect.w -= button_size;
+        m_textfield.SetRect(mover_rect);
+    }
+    else if ( m_axis == AXIS_X )  // rotated sideways
+    {
+        m_mover.SetRect(TBRect(0, 0, title_height, GetRect().h ));
+        PreferredSize ps = m_resizer.GetPreferredSize();
+        m_resizer.SetRect(TBRect(GetRect().w - ps.pref_w, GetRect().h - ps.pref_h, ps.pref_w, ps.pref_h));
+        TBRect mover_rect = m_mover.GetPaddingRect();
+        int button_size = mover_rect.w;
+        m_close_button.SetRect(TBRect(mover_rect.x + 1, mover_rect.y + 1, button_size, button_size));
+        if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
+            mover_rect.y += button_size;
+        m_redock_button.SetRect(TBRect(mover_rect.x + 1, mover_rect.y + 1, button_size, button_size));
+        if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
+            mover_rect.y -= button_size;
+        m_textfield.SetRect(TBRect(mover_rect.x + 5, mover_rect.y + mover_rect.h - button_size, button_size - 1, button_size));
+    }
 }
 
 

Source/ThirdParty/TurboBadger/tb_atomic_widgets.h

@@ -284,6 +284,10 @@ public:
     virtual bool OnEvent(const TBWidgetEvent &ev);
     virtual void OnResized(int old_w, int old_h);
 
+    /// Get the widget that should receive the events this widget invoke.
+    /// By default the parent, when undocked, the origin widget if specified.
+    virtual TBWidget *GetEventDestination();
+
 protected:
 
     void Redock();

Source/ThirdParty/TurboBadger/tb_window.cpp

@@ -13,12 +13,18 @@ namespace tb {
 TBWindow::TBWindow()
     : m_settings(WINDOW_SETTINGS_DEFAULT)
 {
+// ATOMIC BEGIN
+    m_axis = AXIS_Y;
+// ATOMIC END
     SetSkinBg(TBIDC("TBWindow"), WIDGET_INVOKE_INFO_NO_CALLBACKS);
     AddChild(&m_mover);
     AddChild(&m_resizer);
     m_mover.SetSkinBg(TBIDC("TBWindow.mover"));
     m_mover.AddChild(&m_textfield);
     m_textfield.SetIgnoreInput(true);
+// ATOMIC BEGIN
+    m_textfield.SetSqueezable(true);
+// ATOMIC END
     m_mover.AddChild(&m_close_button);
     m_close_button.SetSkinBg(TBIDC("TBWindow.close"));
     m_close_button.SetIsFocusable(false);
@@ -197,8 +203,20 @@ TBRect TBWindow::GetPaddingRect()
 {
     TBRect padding_rect = TBWidget::GetPaddingRect();
     int title_height = GetTitleHeight();
-    padding_rect.y += title_height;
-    padding_rect.h -= title_height;
+// ATOMIC BEGIN
+    if ( m_axis == AXIS_Y )  // default axis
+    {
+// ATOMIC END
+        padding_rect.y += title_height;
+        padding_rect.h -= title_height;
+// ATOMIC BEGIN
+    }
+    else if ( m_axis == AXIS_X )  // rotated sideways
+    {
+        padding_rect.x += title_height;
+        padding_rect.w -= title_height;
+    }
+// ATOMIC END
     return padding_rect;
 }
 
@@ -216,8 +234,20 @@ PreferredSize TBWindow::OnCalculatePreferredSize(const SizeConstraints &constrai
     }
     // Add window title bar height
     int title_height = GetTitleHeight();
-    ps.min_h += title_height;
-    ps.pref_h += title_height;
+// ATOMIC BEGIN
+    if ( m_axis == AXIS_Y )  // default axis
+    {
+// ATOMIC END
+        ps.min_h += title_height;
+        ps.pref_h += title_height;
+// ATOMIC BEGIN
+    }
+    else if ( m_axis == AXIS_X )  // rotated sideways
+    {
+        ps.min_w += title_height;
+        ps.pref_w += title_height;
+    }
+// ATOMIC END
     return ps;
 }
 
@@ -260,15 +290,42 @@ void TBWindow::OnResized(int old_w, int old_h)
     // Manually move our own decoration children
     // FIX: Put a layout in the TBMover so we can add things there nicely.
     int title_height = GetTitleHeight();
-    m_mover.SetRect(TBRect(0, 0, GetRect().w, title_height));
-    PreferredSize ps = m_resizer.GetPreferredSize();
-    m_resizer.SetRect(TBRect(GetRect().w - ps.pref_w, GetRect().h - ps.pref_h, ps.pref_w, ps.pref_h));
-    TBRect mover_rect = m_mover.GetPaddingRect();
-    int button_size = mover_rect.h;
-    m_close_button.SetRect(TBRect(mover_rect.x + mover_rect.w - button_size, mover_rect.y, button_size, button_size));
-    if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
-        mover_rect.w -= button_size;
-    m_textfield.SetRect(mover_rect);
+// ATOMIC BEGIN
+    if ( m_axis == AXIS_Y )  // default axis 
+    {
+// ATOMIC END
+        m_mover.SetRect(TBRect(0, 0, GetRect().w, title_height));
+        PreferredSize ps = m_resizer.GetPreferredSize();
+        m_resizer.SetRect(TBRect(GetRect().w - ps.pref_w, GetRect().h - ps.pref_h, ps.pref_w, ps.pref_h));
+        TBRect mover_rect = m_mover.GetPaddingRect();
+        int button_size = mover_rect.h;
+        m_close_button.SetRect(TBRect(mover_rect.x + mover_rect.w - button_size, mover_rect.y, button_size, button_size));
+        if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
+            mover_rect.w -= button_size;
+        m_textfield.SetRect(mover_rect);
+// ATOMIC BEGIN
+    }
+    else if ( m_axis == AXIS_X )  // rotated sideways
+    {
+        m_mover.SetRect(TBRect(0, 0, title_height, GetRect().h ));
+        PreferredSize ps = m_resizer.GetPreferredSize();
+        m_resizer.SetRect(TBRect(GetRect().w - ps.pref_w, GetRect().h - ps.pref_h, ps.pref_w, ps.pref_h));
+        TBRect mover_rect = m_mover.GetPaddingRect();
+        int button_size = mover_rect.w;
+        m_close_button.SetRect(TBRect(mover_rect.x + 1, mover_rect.y + 1, button_size, button_size));
+        if (m_settings & WINDOW_SETTINGS_CLOSE_BUTTON)
+            mover_rect.w -= button_size;
+        m_textfield.SetRect(TBRect(mover_rect.x + 5, mover_rect.y + mover_rect.h - button_size, button_size - 1, button_size));
+    }
+// ATOMIC END
+}
+
+// ATOMIC BEGIN
+void TBWindow::SetAxis(AXIS axis)
+{
+    m_axis = axis;
+    Invalidate();
 }
+// ATOMIC END
 
 }; // namespace tb

Source/ThirdParty/TurboBadger/tb_window.h

@@ -99,6 +99,13 @@ public:
     virtual void OnRemove();
     virtual void OnChildAdded(TBWidget *child);
     virtual void OnResized(int old_w, int old_h);
+
+// ATOMIC BEGIN
+    /** Set along which axis the content should be layouted. */
+    virtual AXIS GetAxis() const { return m_axis; }
+    virtual void SetAxis(AXIS axis);
+// ATOMIC END
+
 protected:
     TBMover m_mover;
     TBResizer m_resizer;
@@ -106,6 +113,9 @@ protected:
     TBWidget m_close_button;
     WINDOW_SETTINGS m_settings;
     TBWidgetSafePointer m_last_focus;
+// ATOMIC BEGIN
+    AXIS m_axis;
+// ATOMIC END
     TBWindow *GetTopMostOtherWindow(bool only_activable_windows);
     void SetWindowActiveState(bool active);
     void DeActivate();