From a58434bf37f6a03b1a6efb8d77550fb10ffe3118 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Wed, 15 Nov 2023 15:04:12 +0900 Subject: [PATCH] Revert "[Tizen] Fix IME Window is not shown issue." This reverts commit b61b28aef1e6fe81bfe2cc599ee043721505c17a. --- dali/internal/window-system/common/window-impl.cpp | 6 ------ .../window-system/common/window-render-surface.cpp | 19 +++++-------------- .../ecore-wl2/window-base-ecore-wl2.cpp | 20 ++------------------ .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.h | 1 - 4 files changed, 7 insertions(+), 39 deletions(-) diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index e91a74a..d78acb8 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -226,12 +226,6 @@ void Window::OnAdaptorSet(Dali::Adaptor& adaptor) mEventHandler = EventHandlerPtr(new EventHandler(mWindowSurface->GetWindowBase(), *mAdaptor)); mEventHandler->AddObserver(*this); - if(mWindowBase->GetType() == WindowType::IME) - { - mWindowBase->InitializeIme(); - mWindowSurface->InitializeImeSurface(); - } - // Add Window to bridge for ATSPI auto bridge = Accessibility::Bridge::GetCurrentBridge(); diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index 1955aa4..e6e4556 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -344,11 +344,6 @@ void WindowRenderSurface::CreateSurface() // Create the EGL window EGLNativeWindowType window = mWindowBase->CreateEglWindow(width, height); - if(mWindowBase->GetType() == WindowType::IME) - { - InitializeImeSurface(); - } - auto eglGraphics = static_cast(mGraphics); Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation(); @@ -552,7 +547,7 @@ bool WindowRenderSurface::PreRender(bool resizingSurface, const std::vector(TriggerEventFactory::CreateTriggerEvent(MakeCallback(this, &WindowRenderSurface::ProcessPostRender), - TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER)); - - } + mPostRenderTrigger = std::unique_ptr(TriggerEventFactory::CreateTriggerEvent(MakeCallback(this, &WindowRenderSurface::ProcessPostRender), + TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER)); } } diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index ae2a5db..7731f85 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -920,8 +920,7 @@ WindowBaseEcoreWl2::WindowBaseEcoreWl2(Dali::PositionSize positionSize, Any surf mScreenOffModeChangeDone(true), mVisible(true), mOwnSurface(false), - mBrightnessChangeDone(true), - mIsIMEWindowInitialized(false) + mBrightnessChangeDone(true) { Initialize(positionSize, surface, isTransparent); } @@ -2575,43 +2574,36 @@ void WindowBaseEcoreWl2::SetType(Dali::WindowType type) { case Dali::WindowType::NORMAL: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, Dali::WindowType::NORMAL\n"); windowType = ECORE_WL2_WINDOW_TYPE_TOPLEVEL; break; } case Dali::WindowType::NOTIFICATION: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, Dali::WindowType::NOTIFICATION\n"); windowType = ECORE_WL2_WINDOW_TYPE_NOTIFICATION; break; } case Dali::WindowType::UTILITY: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, Dali::WindowType::UTILITY\n"); windowType = ECORE_WL2_WINDOW_TYPE_UTILITY; break; } case Dali::WindowType::DIALOG: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, Dali::WindowType::DIALOG\n"); windowType = ECORE_WL2_WINDOW_TYPE_DIALOG; break; } case Dali::WindowType::IME: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, Dali::WindowType::IME\n"); windowType = ECORE_WL2_WINDOW_TYPE_NONE; break; } case Dali::WindowType::DESKTOP: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, Dali::WindowType::DESKTOP\n"); windowType = ECORE_WL2_WINDOW_TYPE_DESKTOP; break; } default: { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetType, default window type\n"); windowType = ECORE_WL2_WINDOW_TYPE_TOPLEVEL; break; } @@ -2625,7 +2617,6 @@ void WindowBaseEcoreWl2::SetType(Dali::WindowType type) Dali::WindowType WindowBaseEcoreWl2::GetType() const { - DALI_LOG_RELEASE_INFO("GetType, DALI WindType: %d, mIsIMEWindowInitialized: %d\n", mType, mIsIMEWindowInitialized); return mType; } @@ -3257,19 +3248,13 @@ void WindowBaseEcoreWl2::InitializeIme() Ecore_Wl2_Global* global; Ecore_Wl2_Display* ecoreWl2Display; - if(mIsIMEWindowInitialized) - { - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::InitializeIme, IME Window is already initialized\n"); - return; - } - if(!(ecoreWl2Display = ecore_wl2_connected_display_get(NULL))) { DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get ecore_wl2 connected display\n"); return; } - DALI_LOG_RELEASE_INFO("InitializeIme: Ecore_Wl2_Display: %p, ecore wl window: %p, mIsIMEWindowInitialized: %d\n", ecoreWl2Display, mEcoreWindow, mIsIMEWindowInitialized); + DALI_LOG_RELEASE_INFO("InitializeIme: Ecore_Wl2_Display: %p, ecore wl window: %p\n", ecoreWl2Display, mEcoreWindow); if(!(registry = ecore_wl2_display_registry_get(ecoreWl2Display))) { @@ -3330,7 +3315,6 @@ void WindowBaseEcoreWl2::InitializeIme() wl_input_panel_surface_set_toplevel(mWlInputPanelSurface, mWlOutput, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM); #endif FINISH_DURATION_CHECK("zwp_input_panel_surface_v1_set_toplevel"); - mIsIMEWindowInitialized = true; } void WindowBaseEcoreWl2::ImeWindowReadyToRender() diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h index 3ff8d07..6acb007 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h @@ -728,7 +728,6 @@ private: bool mVisible : 1; bool mOwnSurface; bool mBrightnessChangeDone; - bool mIsIMEWindowInitialized; }; } // namespace Adaptor -- 2.7.4