From: taeyoon <taeyoon0.lee@samsung.com>
Date: Tue, 13 Dec 2016 06:47:47 +0000 (-0800)
Subject: Merge "Remove key event callback" into tizen_3.0
X-Git-Tag: accepted/tizen/4.0/unified/20170920.081503~1^2~33
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fwidget-viewer-dali.git;a=commitdiff_plain;h=41c42ee9ac0d2fae2dd1f05760ae6c7d8f412f0e;hp=f80af1f1056094a302b7906f3c54ff1820d99ee9

Merge "Remove key event callback" into tizen_3.0
---

diff --git a/doc/widget_viewer_dali_doc.h b/doc/widget_viewer_dali_doc.h
new file mode 100644
index 0000000..f7fd499
--- /dev/null
+++ b/doc/widget_viewer_dali_doc.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016  Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @defgroup dali_widget_view Widget Viewer Dali
+ * @ingroup CAPI_WIDGET_FRAMEWORK
+ * @brief API for widget viewer (widget screen, home screen, ...)
+ * @section dali_widget_view_HEADER Required Header
+ * \#include <widget_viewer_dali.h>
+ * @section dali_widget_view_OVERVIEW Overview
+ * Widget Viewer Dali supports development of a widget viewer application by DALi.
+ * Widget Viewer Dali can be used as DALi controls in a DALi application for widget viewer.
+ *
+ */
diff --git a/internal/widget_view/widget_view_impl.cpp b/internal/widget_view/widget_view_impl.cpp
index 068ee35..d08218f 100644
--- a/internal/widget_view/widget_view_impl.cpp
+++ b/internal/widget_view/widget_view_impl.cpp
@@ -706,7 +706,9 @@ void WidgetView::OnInitialize()
     mPreviewImage.SetSize( mWidth, mHeight );
   }
 
-  Self().SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
+  Self().SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
+  Self().SetSize( mWidth, mHeight );
+
   Self().Add( mPreviewImage );
 
   // State text