Emulator build break Dummy Button fix

[Issue]    N/A
[Problem]  In Emulator build #if DUMMY_BUTTON was not
           properly visible.
[Solution] Move Definition creation.
[Verify]   Open browser, open webpage. Start dlogutil.
           Check if dummy button is focused/unfocused.

Change-Id: I3197379f3643faee6b69c7aa838be7edcefe7340

4 files changed, 24 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cee87dd..6941d2d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ option(BUILD_UT "Build Unit tests" OFF)
 option(TIZEN_BUILD "Build for Tizen. Default ON" ON)
 option(DYN_INT_LIBS "Buils internal libs as dynamic" ON)
 option(COVERAGE_STATS "Code coverage" OFF)
+option(DUMMY_BUTTON "Build With Dummy Button" ON)
 
 #Enable C++14 support
 include(CheckCXXCompilerFlag)
@@ -121,9 +122,15 @@ if(TIZEN_BUILD)
     if (${PROFILE} MATCHES "mobile")
         ADD_DEFINITIONS(-DPROFILE_MOBILE=1)
         ADD_DEFINITIONS(-DPWA=0)
-        ADD_DEFINITIONS(-DDUMMY_BUTTON=1)
     endif (${PROFILE} MATCHES "mobile")
 
+    if (${DUMMY_BUTTON} MATCHES "ON")
+        ADD_DEFINITIONS(-DDUMMY_BUTTON=1)
+    endif ()
+    if (${DUMMY_BUTTON} MATCHES "OFF")
+        ADD_DEFINITIONS(-DDUMMY_BUTTON=0)
+    endif()
+
 endif(TIZEN_BUILD)
 
 ADD_DEFINITIONS(-DEDJE_DIR=\"${EDJE_DIR}\")
@@ -175,4 +182,5 @@ message(STATUS "Interal libs are dynamic (DYN_INT_LIBS)    :" ${DYN_INT_LIBS})
 message(STATUS "Building Unit tests      (BUILD_UT)        :" ${BUILD_UT})
 message(STATUS "Code Coverage statistics (COVERAGE_STATS)  :" ${COVERAGE_STATS})
 message(STATUS "Device profile           (PROFILE)         :" ${PROFILE})
+message(STATUS "Building with Dummy Button (DUMMY_BUTTON)  :" ${DUMMY_BUTTON})
 message(STATUS "------------------------------------------")
diff --git a/cmake/EDCCompile.cmake b/cmake/EDCCompile.cmake
index 6f9a340..4a6fab7 100755
--- a/cmake/EDCCompile.cmake
+++ b/cmake/EDCCompile.cmake
@@ -27,6 +27,13 @@ IF(EDJE_CC_EXECUTABLE)
             SET(IF_PROFILE_MOBILE 0)
          ENDIF()
 
+         if (${DUMMY_BUTTON} MATCHES "ON")
+             SET(IF_DUMMY_BUTTON 1)
+         endif ()
+         if (${DUMMY_BUTTON} MATCHES "OFF")
+             SET(IF_DUMMY_BUTTON 0)
+         endif()
+
          FOREACH(resolution ${BROWSER_RESOLUTION})
              SET(tmp_output ${Edj_Output}/${resolution}_${Name})
              ADD_CUSTOM_COMMAND(OUTPUT ${tmp_output}
diff --git a/packaging/org.tizen.browser.spec b/packaging/org.tizen.browser.spec
index 0a0f5df..85f0ef5 100755
--- a/packaging/org.tizen.browser.spec
+++ b/packaging/org.tizen.browser.spec
@@ -56,6 +56,9 @@ BuildRequires:  pkgconfig(capi-content-media-content)
 BuildRequires:  pkgconfig(shortcut)
 %endif
 
+#This is the main switch for The Dummy Button - ON/OFF
+%define _dummy_button "ON"
+
 %define BUILD_UT  %{?build_ut:ON}%{!?build_ut:OFF}
 %if %BUILD_UT == "ON"
 BuildRequires:  boost-test
@@ -100,6 +103,7 @@ cmake .. \
     -DBUILD_UT=%{BUILD_UT} \
     -DCOVERAGE_STATS=%{COVERAGE_STATS} \
     -DPROFILE=%{profile} \
+    -DDUMMY_BUTTON=%{_dummy_button} \
     -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
     -DTZ_SYS_RO_ICONS=%{TZ_SYS_RO_ICONS} \
 %if "%{?_with_wayland}" == "1"
diff --git a/services/WebPageUI/edc/WebPageUI.edc b/services/WebPageUI/edc/WebPageUI.edc
index 7bcaf2b..93c1beb 100755
--- a/services/WebPageUI/edc/WebPageUI.edc
+++ b/services/WebPageUI/edc/WebPageUI.edc
@@ -331,6 +331,7 @@ collections { base_scale: 2.6;
                     rel2 { relative: 1.0 1.0; to: "bg"; }
                 }
             }
+#if DUMMY_BUTTON
             swallow { "web_view_dummy_button"; scale;
                 mouse_events: 1;
                 repeat_events: 1;
@@ -348,6 +349,7 @@ collections { base_scale: 2.6;
                     visible: 0;
                 }
             }
+#endif
             part { name: "progressbar_bg";
                 type: IMAGE;
                 scale: 1;
@@ -416,6 +418,7 @@ collections { base_scale: 2.6;
                     action: STATE_SET "default" 0.0;
                     target: "bottom_toolbar";
                 }
+#if DUMMY_BUTTON
                 program { name: "show,dummy_button";
                     signal: "show,dummy_button";
                     action: STATE_SET "default" 0.0;
@@ -426,6 +429,7 @@ collections { base_scale: 2.6;
                     action: STATE_SET "hidden" 0.0;
                     target: "web_view_dummy_button";
                 }
+#endif
             }
 
             #include "WebPageUIUrlHistoryList.edc"