#define SHOT_GUIDE_POPUP_WIDTH 600
#define SHOT_GUIDE_POPUP_HEIGHT 72
+#define EDIT_SHOTCUTS_CONTIAIN_CORRECT_W 10
+#define EDIT_SHOTCUTS_CONTIAIN_CORRECT_H 10
+
+
static Shortcuts_List_Prop edit_shortcuts_prop_array[CAM_EDIT_SHORTCUTS_INDEX_MAX]
= {
/*row 1*/
{
int swap_rel1_x, swap_rel1_y, swap_w, swap_h;
int cur_rel1_x, cur_rel1_y, cur_w, cur_h;
- cur_rel1_x = sub_shortcuts.x;
- cur_rel1_y = sub_shortcuts.y;
- cur_w = sub_shortcuts.w;
- cur_h = sub_shortcuts.h;
+ if (parent_shortcuts.w * parent_shortcuts.h < sub_shortcuts.w * sub_shortcuts.h) {
+ swap_rel1_x = sub_shortcuts.x;
+ swap_rel1_y = sub_shortcuts.y;
+ swap_w = sub_shortcuts.w;
+ swap_h = sub_shortcuts.h;
+
+ cur_rel1_x = parent_shortcuts.x;
+ cur_rel1_y = parent_shortcuts.y;
+ cur_w = parent_shortcuts.w;
+ cur_h = parent_shortcuts.h;
- swap_rel1_x = parent_shortcuts.x;
- swap_rel1_y = parent_shortcuts.y;
- swap_w = parent_shortcuts.w;
- swap_h = parent_shortcuts.h;
+ } else {
+ cur_rel1_x = sub_shortcuts.x;
+ cur_rel1_y = sub_shortcuts.y;
+ cur_w = sub_shortcuts.w;
+ cur_h = sub_shortcuts.h;
+
+ swap_rel1_x = parent_shortcuts.x;
+ swap_rel1_y = parent_shortcuts.y;
+ swap_w = parent_shortcuts.w;
+ swap_h = parent_shortcuts.h;
+ }
return __shortcuts_rect_contain_check(swap_rel1_x, swap_rel1_y, swap_w, swap_h,
cur_rel1_x, cur_rel1_y, cur_w, cur_h,
gboolean sub_in_parent = FALSE;
sub_in_parent = __cam_toolbar_shortcuts_rect_contain_check(sub_rect,
parent_rect,
- sub_rect.w/4,
- sub_rect.w/4);
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_W,
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_H);
if (sub_in_parent) {
if (cur_ele->is_on_menu_bar) {
__remove_menubar_shortcut(ad, cur_ele->menu_bar_no);
gboolean sub_in_parent = FALSE;
sub_in_parent = __cam_toolbar_shortcuts_rect_contain_check(sub_rect,
parent_rect,
- sub_rect.w/4,
- sub_rect.w/4);
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_W,
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_H);
if (sub_in_parent) {
DEBUG_TRACE("find swap ele");
swap_ele = shortcuts_ele;
gboolean sub_in_parent = FALSE;
sub_in_parent = __cam_toolbar_shortcuts_rect_contain_check(sub_rect,
parent_rect,
- sub_rect.w/4,
- sub_rect.w/4);
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_W,
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_H);
if (sub_in_parent) {
if (cur_ele->is_on_menu_bar) {
__remove_menubar_shortcut(ad, cur_ele->menu_bar_no);
if (type < 0) {
CAM_Edit_ShortCuts_Rect parent_rect;
__get_shortcuts_rect(icon, &parent_rect);
+ DEBUG_TRACE("==%d==", i);
DEBUG_TRACE("x y w h%d %d %d %d", parent_rect.x, parent_rect.y, parent_rect.w, parent_rect.h);
+ DEBUG_TRACE("x y w h%d %d %d %d", sub_rect.x, sub_rect.y, sub_rect.w, sub_rect.h);
gboolean sub_in_parent = FALSE;
sub_in_parent = __cam_toolbar_shortcuts_rect_contain_check(sub_rect,
parent_rect,
- sub_rect.w/4,
- sub_rect.w/4);
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_W,
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_H);
if (sub_in_parent) {
+ DEBUG_TRACE("%d", i);
return i;
}
}
gboolean sub_in_parent = FALSE;
sub_in_parent = __cam_toolbar_shortcuts_rect_contain_check(sub_rect,
parent_rect,
- sub_rect.w/4,
- sub_rect.w/4);
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_W,
+ EDIT_SHOTCUTS_CONTIAIN_CORRECT_H);
if (sub_in_parent) {
DEBUG_TRACE("find swap ele");
*swap_ele = shortcuts_ele;
DEBUG_TRACE("%d", swap_condition);
if (swap_condition) {
+ if (ad->swap_data) {
+ if (ad->swap_data->is_on_menu_bar) {
+ if (ad->swap_data->menu_bar_no != swap_ele->menu_bar_no) {
+ int r, g, b, a;
+ r = g = b = a = 0;
+ if (ad->toolbar_menu_arrays[swap_ele->menu_bar_no].icon) {
+ evas_object_color_get(ad->toolbar_menu_arrays[ad->swap_data->menu_bar_no].icon, &r, &g, &b, &a);
+ evas_object_color_set(ad->toolbar_menu_arrays[ad->swap_data->menu_bar_no].icon, 255, 255, 255, 255);
+ }
+ }
+ }
+ }
ad->swap_data = swap_ele;
if ((swap_ele->is_on_menu_bar | moving_ele->is_on_menu_bar) == FALSE) {/*note: both is not in menubar*/
if (ABS(moving_ele->part_index - swap_ele->part_index) == 1) {