fix jira defect for rotation hide button

Change-Id: Iab04527ab92533fff8b39140fd705275bf3bb084

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index a0d3f9e..83f8c64 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -3730,6 +3730,43 @@ _Toolbar::RealignButtonItem(_Button* pButton)
                                                *(pButton->GetBitmap(_BUTTON_STATUS_SELECTED)));
        }
 
+       if (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL) != null)
+       {
+               pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL,
+                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
+                                               *(pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL)));
+       }
+
+       if (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED) != null)
+       {
+               pButton->SetEffectBitmap(_BUTTON_STATUS_PRESSED,
+                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
+                                               *(pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED)));
+       }
+       if (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED) != null)
+       {
+               pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED,
+                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
+                                               *(pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
+       }
+       if (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED) != null)
+       {
+               pButton->SetEffectBitmap(_BUTTON_STATUS_DISABLED,
+                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
+                                               *(pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED)));
+       }
+       if (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED) != null)
+       {
+               pButton->SetEffectBitmap(_BUTTON_STATUS_SELECTED,
+                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
+                                               *(pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED)));
+       }
+
        return E_SUCCESS;
 }
 

diff --git a/src/ui/resource/FUi_ResourceButtonConfig.cpp b/src/ui/resource/FUi_ResourceButtonConfig.cpp
index cd5d9ba..ec9628a 100644 (file)
--- a/src/ui/resource/FUi_ResourceButtonConfig.cpp
+++ b/src/ui/resource/FUi_ResourceButtonConfig.cpp
@@ -25,7 +25,7 @@ START_UI_CONFIG(BUTTON);
 {
        ADD_COLOR_CONFIG(BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(BG_DISABLED, $W011);
-       ADD_COLOR_CONFIG(BG_PRESSED, $B041);
+       ADD_COLOR_CONFIG(BG_PRESSED, $B042);
        ADD_COLOR_CONFIG(BG_HIGHLIGHTED, $B042);
 
        ADD_COLOR_CONFIG(TEXT_NORMAL, $F031L1);