[Tizen] Fixes bug where SetGeometryHittestEnabled does not update.

Change-Id: I16e492f9de5e13228f7b45e3d4a15bcd3261162c

diff --git a/dali/internal/window-system/android/window-system-android.cpp b/dali/internal/window-system/android/window-system-android.cpp
index f3fdb2fa9fd20b5cbb21e590e9870cf56c6065cc..2b1e5c5c4467cd7bedda964c4e32185ef9aafd7f 100644 (file)
--- a/dali/internal/window-system/android/window-system-android.cpp
+++ b/dali/internal/window-system/android/window-system-android.cpp
@@ -91,8 +91,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest && Dali::Adaptor::IsAvailable())
+  if(gGeometryHittest != enable && Dali::Adaptor::IsAvailable())
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -103,6 +102,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()

diff --git a/dali/internal/window-system/macos/window-system-mac.mm b/dali/internal/window-system/macos/window-system-mac.mm
index f5e4acfda6c8e8e6c095fda145d3f94cb8baaea2..aae315228f92a291ddf6c7526ad3bf8f0a17998a 100644 (file)
--- a/dali/internal/window-system/macos/window-system-mac.mm
+++ b/dali/internal/window-system/macos/window-system-mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,8 +84,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest)
+  if(gGeometryHittest != enable)
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -96,6 +95,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-system-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-system-ecore-wl.cpp
index 105cf0fe3b5e949da4875aa4304e2ea47a91c255..d767e5ba33f72e6befc0a2f56e7249355f0cde72 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-system-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-system-ecore-wl.cpp
@@ -94,8 +94,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest && Dali::Adaptor::IsAvailable())
+  if(gGeometryHittest != enable && Dali::Adaptor::IsAvailable())
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -106,6 +105,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
index e0d133c651e72afc5a89bd96561046515087c055..03c8bb8389faaeaac1a38e55fafb324dee6a1379 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
@@ -211,8 +211,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest && Dali::Adaptor::IsAvailable())
+  if(gGeometryHittest != enable && Dali::Adaptor::IsAvailable())
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -223,6 +222,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()

diff --git a/dali/internal/window-system/ubuntu-x11/window-system-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-system-ecore-x.cpp
index 1812f24e7d9da7dea2593357fd93e1d42fc0ef2f..daf0dc5f2f6af7b2f6ef68e318d0200754a7faa0 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/window-system-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/window-system-ecore-x.cpp
@@ -90,8 +90,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest && Dali::Adaptor::IsAvailable())
+  if(gGeometryHittest != enable && Dali::Adaptor::IsAvailable())
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -102,6 +101,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()

diff --git a/dali/internal/window-system/windows/window-system-win.cpp b/dali/internal/window-system/windows/window-system-win.cpp
index 863d166706acd0b824bfd25e7a7591a10132b7b8..c11109efbf2a4b6e67531679a46b8b98a972281e 100644 (file)
--- a/dali/internal/window-system/windows/window-system-win.cpp
+++ b/dali/internal/window-system/windows/window-system-win.cpp
@@ -84,8 +84,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest && Dali::Adaptor::IsAvailable())
+  if(gGeometryHittest != enable && Dali::Adaptor::IsAvailable())
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -96,6 +95,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()

diff --git a/dali/internal/window-system/x11/window-system-x.cpp b/dali/internal/window-system/x11/window-system-x.cpp
index 239c581e9f5bd2ec78acbc0a868e879ce4644d38..e626c5f66790dfd3112dd4279a476019b18b01dc 100644 (file)
--- a/dali/internal/window-system/x11/window-system-x.cpp
+++ b/dali/internal/window-system/x11/window-system-x.cpp
@@ -1150,8 +1150,7 @@ bool GetKeyboardVerticalRepeatInfo(float& rate, float& delay)
 void SetGeometryHittestEnabled(bool enable)
 {
   DALI_LOG_RELEASE_INFO("GeometryHittest : %d \n", enable);
-  gGeometryHittest = enable;
-  if(gGeometryHittest && Dali::Adaptor::IsAvailable())
+  if(gGeometryHittest != enable && Dali::Adaptor::IsAvailable())
   {
     Dali::SceneHolderList sceneHolders = Dali::Adaptor::Get().GetSceneHolders();
     for(auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter)
@@ -1162,6 +1161,7 @@ void SetGeometryHittestEnabled(bool enable)
       }
     }
   }
+  gGeometryHittest = enable;
 }
 
 bool IsGeometryHittestEnabled()