hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=099b87186fb1a3325372e5ff5f3d796d8061ee7a
commit 099b87186fb1a3325372e5ff5f3d796d8061ee7a Author: ChunEon Park <her...@hermet.pe.kr> Date: Tue Jun 23 21:22:00 2015 +0900 modify zoom behavior. changed zoom up/down behavior only if view size is set. it's been quitely useless zoom up/down function without any base size. --- README | 4 ++-- data/about/ABOUT | 4 ++-- src/bin/config_data.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README b/README index 35853f1..4283318 100644 --- a/README +++ b/README @@ -45,8 +45,8 @@ Ctrl+O - On/Off Auto Completion Ctrl+W - Show/Hide Dummy Swallow Ctrl+H - On/Off Part Highlighting Ctrl+T - Insert Defaut Template Code -Ctrl+Mouse Wheel Up - View Scale Up / Font Size Up -Ctrl+Mouse Wheel Down - View Scale Down / Font Size Down +Ctrl+Mouse Wheel Up - View Zoom In (Only if view size is set) / Font Size Up +Ctrl+Mouse Wheel Down - View Zoom Out (Only if view size is set) / Font Size Down Alt+Left - On/Off Full Edit View Alt+Right - On/Off Full Live View diff --git a/data/about/ABOUT b/data/about/ABOUT index f78550f..cbfe178 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -27,8 +27,8 @@ Ctrl+O - On/Off Auto Completion Ctrl+W - Show/Hide Dummy Swallow Ctrl+H - On/Off Part Highlighting Ctrl+T - Insert Defaut Template Code -Ctrl+Mouse Wheel Up - View Scale Up / Font Size Up -Ctrl+Mouse Wheel Down - View Scale Down / Font Size Down +Ctrl+Mouse Wheel Up - View Zoom In (Only if view size is set) / Font Size Up +Ctrl+Mouse Wheel Down - View Zoom Out (Only if view size is set) / Font Size Down Alt+Left - On/Off Full Edit View Alt+Right - On/Off Full Live View diff --git a/src/bin/config_data.c b/src/bin/config_data.c index c7ce95c..2da2d14 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -751,7 +751,8 @@ double config_view_scale_get(void) { config_data *cd = g_cd; - return cd->view_scale; + if (cd->view_size_configurable) return cd->view_scale; + else return 1; } void --