Update from master repository (DEV300_m81).

1 files changed, 10 insertions, 139 deletions

diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index e0b48a6cf57b..de49b7a6abb5 100644..100755
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -60,13 +60,12 @@ namespace sd { namespace toolpanel {
 const int TitleBar::snIndentationWidth = 16;
 
 TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable)
-: ::Window (pParent)
+: ::Window (pParent, WB_TABSTOP)
 , TreeNode(this)
 , meType(eType)
 , msTitle(rsTitle)
 , mbExpanded(false)
 , mbFocused(false)
-, mbMouseOver(false)
 , mpDevice(new VirtualDevice (*this))
 , mbIsExpandable (bIsExpandable)
 {
@@ -77,10 +76,6 @@ TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eTyp
     // Change the mouse pointer shape so that it acts as a mouse over effect.
     switch (meType)
     {
-        case TBT_WINDOW_TITLE:
-            break;
-
-        case TBT_CONTROL_TITLE:
         case TBT_SUB_CONTROL_HEADLINE:
             if (mbIsExpandable)
                 SetPointer (POINTER_REFHAND);
@@ -170,14 +165,6 @@ void TitleBar::Paint (const Rectangle& rBoundingBox)
 
     switch (meType)
     {
-        case TBT_WINDOW_TITLE:
-            PaintWindowTitleBar ();
-            break;
-
-        case TBT_CONTROL_TITLE:
-            PaintPanelControlTitle ();
-            break;
-
         case TBT_SUB_CONTROL_HEADLINE:
             PaintSubPanelHeadLineBar ();
             break;
@@ -223,22 +210,21 @@ void TitleBar::SetEnabledState(bool bFlag)
 }
 
 
-void TitleBar::SetFocus (bool bFlag)
+
+
+void TitleBar::GetFocus()
 {
-    mbFocused = bFlag;
-    Invalidate ();
+    mbFocused = true;
+    Invalidate();
 }
 
 
 
 
-void TitleBar::SetMouseOver (bool bFlag)
+void TitleBar::LoseFocus()
 {
-    if (bFlag != mbMouseOver)
-    {
-        mbMouseOver = bFlag;
-        //        Invalidate();
-    }
+    mbFocused = false;
+    Invalidate();
 }
 
 
@@ -251,15 +237,9 @@ bool TitleBar::HasExpansionIndicator (void) const
     {
         switch (meType)
         {
-            case TBT_CONTROL_TITLE:
             case TBT_SUB_CONTROL_HEADLINE:
                 bHasExpansionIndicator = true;
                 break;
-
-            default:
-            case TBT_WINDOW_TITLE:
-                // bHasExpansionIndicator remains false
-                break;
         }
     }
     return bHasExpansionIndicator;
@@ -277,21 +257,6 @@ Image TitleBar::GetExpansionIndicator (void) const
         USHORT nResourceId = 0;
         switch (meType)
         {
-            case TBT_CONTROL_TITLE:
-                if (mbExpanded)
-                    if (bHighContrastMode)
-                        nResourceId = BMP_TRIANGLE_DOWN_H;
-                    else
-                        nResourceId = BMP_TRIANGLE_DOWN;
-                else
-                    if (bHighContrastMode)
-                        nResourceId = BMP_TRIANGLE_RIGHT_H;
-                    else
-                        nResourceId = BMP_TRIANGLE_RIGHT;
-
-                aIndicator = IconCache::Instance().GetIcon(nResourceId);
-                break;
-
             case TBT_SUB_CONTROL_HEADLINE:
                 if (mbExpanded)
                     if (bHighContrastMode)
@@ -306,11 +271,6 @@ Image TitleBar::GetExpansionIndicator (void) const
 
                 aIndicator = IconCache::Instance().GetIcon(nResourceId);
                 break;
-
-            default:
-            case TBT_WINDOW_TITLE:
-                // aIndicator remains empty Image.
-                break;
         }
     }
 
@@ -320,35 +280,6 @@ Image TitleBar::GetExpansionIndicator (void) const
 
 
 
-void TitleBar::PaintPanelControlTitle (void)
-{
-    int nWidth (GetOutputSizePixel().Width());
-    Rectangle aTextBox (CalculateTextBoundingBox (nWidth, true));
-    PaintBackground(CalculateTitleBarBox(aTextBox, nWidth));
-    Rectangle aFocusBox (PaintExpansionIndicator (aTextBox));
-    PaintText (aTextBox);
-    aFocusBox.Union (aTextBox);
-    aFocusBox.Left() += 2;
-    PaintFocusIndicator (aFocusBox);
-    PaintMouseOverIndicator (aTextBox);
-}
-
-
-
-
-void TitleBar::PaintWindowTitleBar (void)
-{
-    Rectangle aTextBox (CalculateTextBoundingBox (
-        GetOutputSizePixel().Width(),
-        true));
-
-    PaintText (aTextBox);
-    PaintFocusIndicator (aTextBox);
-}
-
-
-
-
 void TitleBar::PaintSubPanelHeadLineBar (void)
 {
     int nWidth (GetOutputSizePixel().Width());
@@ -369,7 +300,6 @@ void TitleBar::PaintSubPanelHeadLineBar (void)
     aFocusBox.Left() -= 2;
     aFocusBox.Right() += 1;
     PaintFocusIndicator (aFocusBox);
-    PaintMouseOverIndicator (aTextBox);
 }
 
 
@@ -406,21 +336,6 @@ void TitleBar::PaintFocusIndicator (const Rectangle& rTextBox)
 
 
 
-void TitleBar::PaintMouseOverIndicator (const Rectangle& rTextBox)
-{
-    if (mbMouseOver)
-    {
-        Rectangle aBox (rTextBox);
-        // Show the line below the focus rectangle (which is painted
-        // after and over the mouse over indicator.)
-        //        aBox.Bottom() += 2;
-        //        DrawLine (aBox.BottomLeft(), aBox.BottomRight());
-    }
-}
-
-
-
-
 Rectangle TitleBar::PaintExpansionIndicator (const Rectangle& rTextBox)
 {
     Rectangle aExpansionIndicatorArea;
@@ -482,29 +397,6 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
 
     switch (meType)
     {
-        case TBT_CONTROL_TITLE:
-        {
-            mpDevice->SetFillColor (
-                GetSettings().GetStyleSettings().GetDialogColor());
-            mpDevice->DrawRect(rTitleBarBox);
-
-            mpDevice->SetFillColor();
-            mpDevice->SetLineColor (
-                GetSettings().GetStyleSettings().GetLightColor());
-            mpDevice->DrawLine(
-                rTitleBarBox.TopLeft(),rTitleBarBox.TopRight());
-            mpDevice->DrawLine(
-                rTitleBarBox.TopLeft(),rTitleBarBox.BottomLeft());
-
-            mpDevice->SetLineColor (
-                GetSettings().GetStyleSettings().GetShadowColor());
-            mpDevice-> DrawLine(
-                rTitleBarBox.BottomLeft(), rTitleBarBox.BottomRight());
-            mpDevice->DrawLine(
-                rTitleBarBox.TopRight(), rTitleBarBox.BottomRight());
-        }
-        break;
-
         case TBT_SUB_CONTROL_HEADLINE:
         {
             Color aColor (GetSettings().GetStyleSettings().GetDialogColor());
@@ -534,10 +426,6 @@ void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
                 Point(rTitleBarBox.Right(), rTitleBarBox.Bottom()));
         }
         break;
-
-        default:
-        case TBT_WINDOW_TITLE:
-            break;
     }
 }
 
@@ -588,16 +476,6 @@ Rectangle TitleBar::CalculateTitleBarBox (
 
    switch (meType)
    {
-       case TBT_WINDOW_TITLE:
-           aTitleBarBox.Bottom() += aTitleBarBox.Top();
-           aTitleBarBox.Top() = 0;
-           break;
-
-        case TBT_CONTROL_TITLE:
-           aTitleBarBox.Bottom() += aTitleBarBox.Top();
-           aTitleBarBox.Top() = 0;
-           break;
-
         case TBT_SUB_CONTROL_HEADLINE:
            aTitleBarBox.Top() -= 3;
            aTitleBarBox.Bottom() += 3;
@@ -614,15 +492,8 @@ Rectangle TitleBar::CalculateTitleBarBox (
 
 
 
-void TitleBar::MouseMove (const MouseEvent& rEvent)
+void TitleBar::MouseMove (const MouseEvent& )
 {
-    Point aRelativePosition = rEvent.GetPosPixel() - GetPosPixel();
-    Size aSize = GetSizePixel();
-    SetMouseOver (
-        aRelativePosition.X() >= 0
-        && aRelativePosition.Y() >= 0
-        && aRelativePosition.X() < aSize.Width()
-        && aRelativePosition.Y() < aSize.Height());
 }