rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0ba1fb379db5a32ef541c6d5220e7c52ef78d65b
commit 0ba1fb379db5a32ef541c6d5220e7c52ef78d65b
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Thu Mar 31 12:10:05 2016 +0300
menu: add item "Fill workpace"
Change-Id: Iacdbc68166b012401b6b8b6e5810db787ceac4b1
---
src/bin/common/signals.h | 1 +
src/bin/ui/main_window.h | 1 +
src/bin/ui/menu.c | 5 +++++
src/bin/ui/tabs.c | 10 ++++++++++
src/bin/ui/workspace/workspace.c | 2 +-
src/bin/ui/workspace/workspace.h | 7 +++++++
6 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h
index 4b7b3f9..e8af42e 100644
--- a/src/bin/common/signals.h
+++ b/src/bin/common/signals.h
@@ -473,6 +473,7 @@ typedef struct {
#define SIGNAL_SHORTCUT_ZOOM_IN "SIGNAL_SHORTCUT_ZOOM_IN"
#define SIGNAL_SHORTCUT_ZOOM_OUT "SIGNAL_SHORTCUT_ZOOM_OUT"
#define SIGNAL_SHORTCUT_ZOOM_RESET "SIGNAL_SHORTCUT_ZOOM_RESET"
+#define SIGNAL_SHORTCUT_FILL "SIGNAL_SHORTCUT_FILL"
#define SIGNAL_SHORTCUT_OBJECT_AREA "SIGNAL_SHORTCUT_OBJECT_AREA"
/**
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index a1d4fd5..94738e5 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -75,6 +75,7 @@ enum Menu_Item
MENU_VIEW_WORKSPACE_ZOOM_IN,
MENU_VIEW_WORKSPACE_ZOOM_OUT,
MENU_VIEW_WORKSPACE_ZOOM_RESET,
+ MENU_VIEW_WORKSPACE_FILL,
MENU_VIEW_WORKSPACE_OBJECT_AREA,
MENU_VIEW_RULERS_SHOW,
MENU_VIEW_RULERS_ABS,
diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c
index 4c805a8..873d3e9 100644
--- a/src/bin/ui/menu.c
+++ b/src/bin/ui/menu.c
@@ -47,6 +47,7 @@ int MENU_ITEMS_LIST_STYLE_ONLY[] = {
MENU_VIEW_WORKSPACE_ZOOM_IN,
MENU_VIEW_WORKSPACE_ZOOM_OUT,
MENU_VIEW_WORKSPACE_ZOOM_RESET,
+ MENU_VIEW_WORKSPACE_FILL,
MENU_VIEW_WORKSPACE_OBJECT_AREA,
MENU_VIEW_RULERS_SHOW,
MENU_VIEW_RULERS_ABS,
@@ -144,6 +145,9 @@ _menu_cb(void *data __UNUSED__,
case MENU_VIEW_WORKSPACE_ZOOM_RESET:
evas_object_smart_callback_call(ap.win, SIGNAL_SHORTCUT_ZOOM_RESET,
NULL);
break;
+ case MENU_VIEW_WORKSPACE_FILL:
+ evas_object_smart_callback_call(ap.win, SIGNAL_SHORTCUT_FILL, NULL);
+ break;
case MENU_VIEW_RULERS_SHOW:
evas_object_smart_callback_call(tabs_current_workspace_get(),
"ruler,toggle", strdup("rulers"));
break;
@@ -301,6 +305,7 @@ ui_menu_add(void)
ITEM_MENU_ADD(MENU_VIEW, MENU_VIEW_WORKSPACE_ZOOM_IN, NULL, _("Zoom
in"), "+")
ITEM_MENU_ADD(MENU_VIEW, MENU_VIEW_WORKSPACE_ZOOM_OUT, NULL, _("Zoom
out"), "-")
ITEM_MENU_ADD(MENU_VIEW, MENU_VIEW_WORKSPACE_ZOOM_RESET, NULL, _("Reset
zoom"), "/")
+ ITEM_MENU_ADD(MENU_VIEW, MENU_VIEW_WORKSPACE_FILL, NULL, _("Fill
workspace"), NULL)
___(MENU_VIEW);
ITEM_MENU_ADD(MENU_VIEW, MENU_VIEW_WORKSPACE_OBJECT_AREA, NULL, _("Show
object area"), "o")
___(MENU_VIEW);
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index a132945..3ee13c7 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -789,6 +789,15 @@ _shortcut_zoom_reset_cb(void *data __UNUSED__,
}
static void
+_shortcut_fill_cb(void *data __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ if (tabs.current_workspace)
+ workspace_container_fill(tabs.current_workspace);
+}
+
+static void
_shortcut_object_area_cb(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
@@ -924,6 +933,7 @@ tabs_add(void)
evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_ZOOM_IN,
_shortcut_zoom_in_cb, NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_ZOOM_OUT,
_shortcut_zoom_out_cb, NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_ZOOM_RESET,
_shortcut_zoom_reset_cb, NULL);
+ evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_FILL,
_shortcut_fill_cb, NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_OBJECT_AREA,
_shortcut_object_area_cb, NULL);
return tabs.layout;
}
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 0801243..2b1a677 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -1215,7 +1215,7 @@ workspace_zoom_factor_get(Evas_Object *obj)
void
workspace_container_fill(Evas_Object *obj)
{
- Evas_Coord w, h;
+ int w, h;
int r, t, l, b;
Scroll_Area *area;
diff --git a/src/bin/ui/workspace/workspace.h b/src/bin/ui/workspace/workspace.h
index 45229dd..8194211 100644
--- a/src/bin/ui/workspace/workspace.h
+++ b/src/bin/ui/workspace/workspace.h
@@ -251,6 +251,13 @@ workspace_zoom_factor_set(Evas_Object *obj, double factor);
double
workspace_zoom_factor_get(Evas_Object *obj);
+/**
+ * Resize the container to workspace size
+ *
+ * @param obj The workspace object.
+ *
+ * @ingroup Workspace
+ */
void
workspace_container_fill(Evas_Object *obj);
--
