From df984b67bb2fad437ac9a7ee1b78451fafb9a69c Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Mon, 1 Apr 2013 21:58:18 +0900 Subject: [PATCH] [Release] wrt_0.8.174 --- packaging/wrt.spec | 4 ++-- src/view/webkit/view_logic.cpp | 2 +- src/wrt-client/wrt-client.cpp | 29 +++++++++++++++++++++++------ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/packaging/wrt.spec b/packaging/wrt.spec index 61ec9c8..3f4221b 100644 --- a/packaging/wrt.spec +++ b/packaging/wrt.spec @@ -1,7 +1,7 @@ -#git:framework/web/wrt wrt_0.8.173 +#git:framework/web/wrt wrt_0.8.174 Name: wrt Summary: web runtime -Version: 0.8.173 +Version: 0.8.174 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp index 36b2315..ad2cca4 100644 --- a/src/view/webkit/view_logic.cpp +++ b/src/view/webkit/view_logic.cpp @@ -552,7 +552,7 @@ void ViewLogic::ewkClientDeinit(Evas_Object *wkView) bool ViewLogic::createEwkView(Evas* canvas) { - LogDebug("createEwkVeiw"); + LogDebug("createEwkView"); Assert(canvas); ADD_PROFILING_POINT("ewk_view_add_with_context", "start"); Evas_Object* newEwkView = ewk_view_add_with_context( diff --git a/src/wrt-client/wrt-client.cpp b/src/wrt-client/wrt-client.cpp index d561c29..0da7735 100644 --- a/src/wrt-client/wrt-client.cpp +++ b/src/wrt-client/wrt-client.cpp @@ -57,6 +57,11 @@ static WindowData* s_preparedWindowData = NULL; static int app_argc = 0; static char** app_argv = NULL; +const int WIN_ORIENTATION_PORTRAIT_PRIMARY_ANGLE = 0; +const int WIN_ORIENTATION_LANDSCAPE_PRIMARY_ANGLE = 270; +const int W3C_ORIENTATION_PORTRAIT_PRIMARY_ANGLE = 0; +const int W3C_ORIENTATION_LANDSCAPE_PRIMARY_ANGLE = 90; + WrtClient::WrtClient(int argc, char **argv) : Application(argc, argv, "wrt-client", false), DPL::TaskDecl(this), @@ -636,14 +641,26 @@ void WrtClient::connectElmCallback() WidgetSettingScreenLock rotationValue = settings.getRotationValue(); if (rotationValue == Screen_Portrait) { - elm_win_rotation_with_resize_set(m_windowData->m_win, 0); - ewk_view_orientation_send(m_widget->GetCurrentWebview(), 0); + elm_win_wm_rotation_preferred_rotation_set( + m_windowData->m_win, + WIN_ORIENTATION_PORTRAIT_PRIMARY_ANGLE); + ewk_view_orientation_send( + m_widget->GetCurrentWebview(), + W3C_ORIENTATION_PORTRAIT_PRIMARY_ANGLE); } else if (rotationValue == Screen_Landscape) { - elm_win_rotation_with_resize_set(m_windowData->m_win, 270); - ewk_view_orientation_send(m_widget->GetCurrentWebview(), 90); + elm_win_wm_rotation_preferred_rotation_set( + m_windowData->m_win, + WIN_ORIENTATION_LANDSCAPE_PRIMARY_ANGLE); + ewk_view_orientation_send( + m_widget->GetCurrentWebview(), + W3C_ORIENTATION_LANDSCAPE_PRIMARY_ANGLE); } else { - elm_win_rotation_with_resize_set(m_windowData->m_win, 0); - ewk_view_orientation_send(m_widget->GetCurrentWebview(), 0); + elm_win_wm_rotation_preferred_rotation_set( + m_windowData->m_win, + WIN_ORIENTATION_PORTRAIT_PRIMARY_ANGLE); + ewk_view_orientation_send( + m_widget->GetCurrentWebview(), + W3C_ORIENTATION_PORTRAIT_PRIMARY_ANGLE); } } } -- 2.7.4