Merge "Changed to not always clearFocus when a touch occurs." into devel/master

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index d6bae90..b1ff578 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -37,6 +37,7 @@
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
 #include <dali-toolkit/internal/controls/text-controls/text-editor-property-handler.h>
+#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/text/rendering/text-backend.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
@@ -862,6 +863,11 @@ void TextEditor::OnTap(const TapGesture& gesture)
   mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top);
   mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top);
 
+  Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+  if (keyboardFocusManager)
+  {
+    keyboardFocusManager.SetCurrentFocusActor(Self());
+  }
   SetKeyInputFocus();
 }
 
@@ -893,6 +899,11 @@ bool TextEditor::OnKeyEvent(const KeyEvent& event)
     // Make sure ClearKeyInputFocus when only key is up
     if(event.GetState() == KeyEvent::UP)
     {
+      Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+      if (keyboardFocusManager)
+      {
+        keyboardFocusManager.ClearFocus();
+      }
       ClearKeyInputFocus();
     }
 

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 3cbd0b9..6933832 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -36,6 +36,7 @@
 #include <dali-toolkit/devel-api/text/rendering-backend.h>
 #include <dali-toolkit/internal/controls/text-controls/common-text-utils.h>
 #include <dali-toolkit/internal/controls/text-controls/text-field-property-handler.h>
+#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/text/rendering/text-backend.h>
 #include <dali-toolkit/internal/text/text-effects-style.h>
@@ -796,6 +797,11 @@ void TextField::OnTap(const TapGesture& gesture)
   mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top);
   mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top);
 
+  Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+  if (keyboardFocusManager)
+  {
+    keyboardFocusManager.SetCurrentFocusActor(Self());
+  }
   SetKeyInputFocus();
 }
 
@@ -827,6 +833,11 @@ bool TextField::OnKeyEvent(const KeyEvent& event)
     // Make sure ClearKeyInputFocus when only key is up
     if(event.GetState() == KeyEvent::UP)
     {
+      Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get();
+      if (keyboardFocusManager)
+      {
+        keyboardFocusManager.ClearFocus();
+      }
       ClearKeyInputFocus();
     }
 

diff --git a/dali-toolkit/styles/images-common/button-down.9.png b/dali-toolkit/styles/images-common/button-down.9.png
index f6e25ab..cb7df7b 100644 (file)
Binary files a/dali-toolkit/styles/images-common/button-down.9.png and b/dali-toolkit/styles/images-common/button-down.9.png differ

diff --git a/dali-toolkit/styles/images-common/button-up.9.png b/dali-toolkit/styles/images-common/button-up.9.png
index a2e2e01..252880d 100644 (file)
Binary files a/dali-toolkit/styles/images-common/button-up.9.png and b/dali-toolkit/styles/images-common/button-up.9.png differ

diff --git a/dali-toolkit/styles/images-common/checkbox-selected-disabled.png b/dali-toolkit/styles/images-common/checkbox-selected-disabled.png
index a6517b8..c5996ee 100644 (file)
Binary files a/dali-toolkit/styles/images-common/checkbox-selected-disabled.png and b/dali-toolkit/styles/images-common/checkbox-selected-disabled.png differ

diff --git a/dali-toolkit/styles/images-common/checkbox-selected.png b/dali-toolkit/styles/images-common/checkbox-selected.png
index e3a8c43..91be569 100644 (file)
Binary files a/dali-toolkit/styles/images-common/checkbox-selected.png and b/dali-toolkit/styles/images-common/checkbox-selected.png differ

diff --git a/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png b/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png
index 022c1cf..7aba7cf 100644 (file)
Binary files a/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png and b/dali-toolkit/styles/images-common/checkbox-unselected-disabled.png differ

diff --git a/dali-toolkit/styles/images-common/checkbox-unselected.png b/dali-toolkit/styles/images-common/checkbox-unselected.png
index 58e9390..b8a7d0d 100644 (file)
Binary files a/dali-toolkit/styles/images-common/checkbox-unselected.png and b/dali-toolkit/styles/images-common/checkbox-unselected.png differ

diff --git a/dali-toolkit/styles/images-common/radio-button-selected-disabled.png b/dali-toolkit/styles/images-common/radio-button-selected-disabled.png
index 5c40e4b..4e30b7f 100644 (file)
Binary files a/dali-toolkit/styles/images-common/radio-button-selected-disabled.png and b/dali-toolkit/styles/images-common/radio-button-selected-disabled.png differ

diff --git a/dali-toolkit/styles/images-common/radio-button-selected.png b/dali-toolkit/styles/images-common/radio-button-selected.png
index d49cbb5..7c3afab 100644 (file)
Binary files a/dali-toolkit/styles/images-common/radio-button-selected.png and b/dali-toolkit/styles/images-common/radio-button-selected.png differ

diff --git a/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png b/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png
index 0c5fa5f..dc659f8 100644 (file)
Binary files a/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png and b/dali-toolkit/styles/images-common/radio-button-unselected-disabled.png differ

diff --git a/dali-toolkit/styles/images-common/radio-button-unselected.png b/dali-toolkit/styles/images-common/radio-button-unselected.png
index 6f647e8..65d93c6 100644 (file)
Binary files a/dali-toolkit/styles/images-common/radio-button-unselected.png and b/dali-toolkit/styles/images-common/radio-button-unselected.png differ