Always on display

Screen won't be dimmed when Universal Switch window exist.

Asumption:
Window Manager handles EFL_UTIL_SCREEN_MODE_ALWAYS_ON properly

Change-Id: I5de38f8e9a194b847a183979a170ad8bf6e7f1a9

diff --git a/org.tizen.universal-switch.xml b/org.tizen.universal-switch.xml
index 5911b7d..3557641 100644 (file)
--- a/org.tizen.universal-switch.xml
+++ b/org.tizen.universal-switch.xml
@@ -19,6 +19,7 @@
         <privilege>http://tizen.org/privilege/volume.set</privilege>
         <privilege>http://tizen.org/privilege/screenshot</privilege>
         <privilege>http://tizen.org/privilege/mediastorage</privilege>
+        <privilege>http://tizen.org/privilege/display</privilege>
     </privileges>
 
 </manifest>

diff --git a/src/Window.cpp b/src/Window.cpp
index 968bb03..e3c4a78 100644 (file)
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -20,7 +20,7 @@
 #include "Ecore_Wayland.h"
 
 Window::Window()
-       : handler(nullptr, evas_object_del), screenWidth(0), screenHeight(0)
+       : handler(nullptr, removeHandler), screenWidth(0), screenHeight(0)
 {
        DEBUG("adding window");
        auto windowHandler = elm_win_add(NULL, "universal-switch", ELM_WIN_NOTIFICATION);
@@ -44,6 +44,11 @@ Window::Window()
        handler.reset(windowHandler);
        ecore_wl_window_input_region_set(waylandWindow, 0, 0, 0, 0);
        ecore_wl_window_focus_skip_set(waylandWindow, EINA_TRUE);
+
+       auto status = efl_util_set_window_screen_mode(windowHandler, EFL_UTIL_SCREEN_MODE_ALWAYS_ON);
+       if (status)
+               ERROR("Display mode cannot be set %d", status);
+
        quickpanel = std::make_unique<Quickpanel>(windowHandler);
 }
 
@@ -57,6 +62,21 @@ Evas_Object *Window::getHandler()
        return handler.get();
 }
 
+void Window::removeHandler(Evas_Object *handler)
+{
+       DEBUG("Removing window");
+
+       /**
+        * evas_object_del is not enough to restore EFL_UTIL_SCREEN_MODE_DEFAULT, event won't be noticed by screen manager
+        * bug in efl_util_set_window_screen_mode implementation requires setting default mode on display on window closure
+        */
+       auto status = efl_util_set_window_screen_mode(handler, EFL_UTIL_SCREEN_MODE_DEFAULT);
+       if (status)
+               ERROR("Display mode cannot be set %d", status);
+
+       evas_object_del(handler);
+}
+
 Rectangle Window::getDimensions() const
 {
        return {{0, 0}, {screenWidth, screenHeight}};

diff --git a/src/Window.hpp b/src/Window.hpp
index 3d0368e..7a59b59 100644 (file)
--- a/src/Window.hpp
+++ b/src/Window.hpp
@@ -36,6 +36,8 @@ public:
        void bringToFront();
 
 private:
+       static void removeHandler(Evas_Object *handler);
+
        std::unique_ptr<Evas_Object, void(*)(Evas_Object *)> handler;
        Ecore_Wl_Window *waylandWindow;
        int screenWidth;