Tableview applied to GUI v3.5. and modify to be able to receive the event of popup
authoryouseong.ji <youseong.ji@samsung.com>
Mon, 15 Apr 2013 15:22:11 +0000 (00:22 +0900)
committeryouseong.ji <youseong.ji@samsung.com>
Mon, 15 Apr 2013 16:52:45 +0000 (01:52 +0900)
Change-Id: I899e7db56fe7962914f9609956d7a76136c14e49
Signed-off-by: youseong.ji <youseong.ji@samsung.com>
44 files changed:
res/common/usr/share/osp/bitmaps/480x800/black/00_button_off.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_off_dim.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_on.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_dim.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_dim.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_focus.png
res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_circle_button_focus.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_button_off.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_off_dim.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_on.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_dim.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_dim.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_focus.png
res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef.png
res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_dim.png
res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_press.png
res/common/usr/share/osp/bitmaps/480x800/white/00_circle_button_focus.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off_dim.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_dim.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler_dim.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_dim.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_press.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_button_focus.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off_dim.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_dim.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler_dim.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_dim.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_press.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_button_focus.png [new file with mode: 0644]
src/ui/controls/FUiCtrl_TableViewItem.cpp
src/ui/inc/FUiCtrl_TableViewItem.h

index a5837b7..4c58db5 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off.png differ
index ece0ccd..51434c3 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off_dim.png differ
index 9cc9921..834e64b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on.png differ
index b18f5ac..6ad67f1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_dim.png differ
index decc3ee..4ff307b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler.png differ
index 705dbaa..af3352f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_dim.png differ
index 5198b9e..51466c1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_focus.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_focus.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg.png
new file mode 100644 (file)
index 0000000..f0b1ca4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_button_focus.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_button_focus.png
new file mode 100644 (file)
index 0000000..5ad3621
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_button_focus.png differ
index b296d37..f00f6e0 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_off.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_off.png differ
index 76c0035..e112f39 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_off_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_off_dim.png differ
index 063d899..79c6a2c 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on.png differ
index e661fb6..9edef3f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_dim.png differ
index b8bba8e..f2ec648 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler.png differ
index 75be662..7d113bd 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_dim.png differ
index 5198b9e..51466c1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_focus.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_focus.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg.png
new file mode 100644 (file)
index 0000000..250af57
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg.png differ
index f8980c0..6df0a86 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef.png differ
index 052b6b4..531ecc4 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_dim.png differ
index ae6ee4a..35cf8b2 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_press.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_button_focus.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_button_focus.png
new file mode 100644 (file)
index 0000000..13156d6
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_button_focus.png differ
index 976051e..7a0c33f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off.png differ
index d788539..a05516d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off_dim.png differ
index 304d34a..2cfd4ab 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on.png differ
index 2804513..7896bd4 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_dim.png differ
index 3513650..0a47645 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler.png differ
index f334be7..17ae20a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler_dim.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png
new file mode 100644 (file)
index 0000000..6d192cc
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg.png
new file mode 100644 (file)
index 0000000..bf403c5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg.png differ
index 5817984..2f04ebc 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef.png differ
index 5817984..2f04ebc 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_dim.png differ
index 43e220b..0c102a1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_press.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_button_focus.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_button_focus.png
new file mode 100644 (file)
index 0000000..b1f6957
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_button_focus.png differ
index 065ecf1..e58e522 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off.png differ
index 48828ee..340ee9d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off_dim.png differ
index 48c4298..af8cdc5 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on.png differ
index 3e4ccef..202898a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_dim.png differ
index f23fc4a..e87a16e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler_dim.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg.png
new file mode 100644 (file)
index 0000000..f723742
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg.png differ
index 5312a28..8764fba 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_dim.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_dim.png differ
index fea7ec7..4205f4b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_press.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_button_focus.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_button_focus.png
new file mode 100644 (file)
index 0000000..b1f6957
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_button_focus.png differ
index 180a45e..24c256d 100644 (file)
@@ -518,6 +518,9 @@ _TableViewItem::CreateItemDivider(void)
                SysTryReturn(NID_UI_CTRL, __pItemDivider != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
                AttachSystemChild(*__pItemDivider);
+
+               _AccessibilityContainer* pContainer = __pItemDivider->GetAccessibilityContainer();
+               pContainer->Activate(false);
        }
 
        if (__pItemTopDivider == null)
@@ -526,6 +529,9 @@ _TableViewItem::CreateItemDivider(void)
                SysTryReturn(NID_UI_CTRL, __pItemTopDivider != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
                AttachSystemChild(*__pItemTopDivider);
+
+               _AccessibilityContainer* pContainer = __pItemTopDivider->GetAccessibilityContainer();
+               pContainer->Activate(false);
        }
 
        return r;
@@ -1717,6 +1723,29 @@ _TableViewItem::StopTouchReleasedTimer(void)
        return;
 }
 
+void
+_TableViewItem::OnAncestorInputEnableStateChanged(const _Control& control)
+{
+       if (__isPressedTimerEnabled)
+       {
+               StopTouchPressedTimer();
+       }
+
+       __annexOnOffHandlerMoved = false;
+       __itemTouchMoved = false;
+
+       __itemSelected = false;
+       __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL;
+
+       if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED)
+       {
+               __isSelectedDetailButton = false;
+       }
+
+       SetItemChanged(true);
+       Invalidate();
+}
+
 result
 _TableViewItem::StartCheckBoxAnimation(void)
 {
@@ -2878,6 +2907,36 @@ CATCH:
 void
 _TableViewItem::DrawItemDivider(void)
 {
+       if (__pDrawingProperty->itemDividerEnabled == false ||
+               __itemType == TABLE_VIEW_ITEM_TYPE_HEADER ||
+               __itemType == TABLE_VIEW_ITEM_TYPE_FOOTER ||
+               __itemDividerEnabled == false)
+       {
+               if (__pItemDivider != null)
+               {
+                       __pItemDivider->SetVisibleState(false);
+               }
+
+               if (__pItemTopDivider != null)
+               {
+                       __pItemTopDivider->SetVisibleState(false);
+               }
+
+               return;
+       }
+       else
+       {
+               if (__pItemDivider != null)
+               {
+                       __pItemDivider->SetVisibleState(true);
+               }
+
+               if (__pItemTopDivider != null)
+               {
+                       __pItemTopDivider->SetVisibleState(true);
+               }
+       }
+
        FloatRectangle dividerBottomBounds;
        FloatRectangle dividerTopBounds;
        Color dividerColor;
@@ -2885,22 +2944,21 @@ _TableViewItem::DrawItemDivider(void)
        FloatRectangle bounds;
        FloatPoint bottomPoint;
 
-       if (__pDrawingProperty->itemDividerEnabled == false ||
-               __itemType == TABLE_VIEW_ITEM_TYPE_HEADER ||
-               __itemType == TABLE_VIEW_ITEM_TYPE_FOOTER ||
-               __itemDividerEnabled == false)
+       if(     __drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED ||
+               __drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_HIGHLIGHTED)
        {
-               if (__pItemDivider != null)
+               if(__pItemDivider != null && __itemType != TABLE_VIEW_ITEM_TYPE_TITLE)
                {
                        __pItemDivider->SetVisibleState(false);
                }
 
-               if (__pItemTopDivider != null)
+               if(__pItemTopDivider != null)
                {
                        __pItemTopDivider->SetVisibleState(false);
                }
        }
-       else if (__itemType == TABLE_VIEW_ITEM_TYPE_TITLE)
+
+       if (__itemType == TABLE_VIEW_ITEM_TYPE_TITLE)
        {
                if(__pItemBgBitmap[__drawingStatus] != null)
                {
@@ -2979,9 +3037,6 @@ _TableViewItem::DrawItemDivider(void)
                                __pItemDivider->Invalidate();
                        }
                }
-
-               _AccessibilityContainer* pContainer = __pItemDivider->GetAccessibilityContainer();
-               pContainer->Activate(false);
        }
 
        if (__pItemTopDivider != null)
@@ -2992,9 +3047,6 @@ _TableViewItem::DrawItemDivider(void)
                        __pItemTopDivider->SetBackgroundColor(dividerColor);
                        __pItemTopDivider->Invalidate();
                }
-
-               _AccessibilityContainer* pContainer = __pItemTopDivider->GetAccessibilityContainer();
-               pContainer->Activate(false);
        }
 }
 
@@ -3099,7 +3151,7 @@ _TableViewItem::CalculateItemHighlightBounds(void)
                GET_FIXED_VALUE_CONFIG(TABLEVIEW::ITEM_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, itemHighlightMarginInt);
                itemHighlightMargin = _CoordinateSystemUtils::ConvertToFloat(itemHighlightMarginInt);  // +++ check floating
        }
-       bounds.SetBounds(0.0f, itemHighlightMargin, itemBounds.width, itemBounds.height - itemHighlightMargin *2);
+       bounds.SetBounds(0.0f, 0.0f, itemBounds.width, itemBounds.height);
 
        return bounds;
 }
index d843436..3d8c623 100644 (file)
@@ -308,6 +308,8 @@ protected:
        result StartTouchReleasedTimer(void);
        void StopTouchReleasedTimer(void);
 
+       void OnAncestorInputEnableStateChanged(const _Control& control);
+
 private:
        _TableViewItem(const _TableViewItem&);
        _TableViewItem& operator =(const _TableViewItem&);