diff --git a/interfaces/innerkits/wm/window.h b/interfaces/innerkits/wm/window.h index 8ce88d05..7ca06962 100644 --- a/interfaces/innerkits/wm/window.h +++ b/interfaces/innerkits/wm/window.h @@ -131,7 +131,7 @@ public: class ITouchOutsideListener : virtual public RefBase { public: - virtual void OnTouchOutside() = 0; + virtual void OnTouchOutside() const = 0; }; class Window : public RefBase { diff --git a/interfaces/innerkits/wm/wm_common.h b/interfaces/innerkits/wm/wm_common.h index 3d652068..ae02c4dd 100644 --- a/interfaces/innerkits/wm/wm_common.h +++ b/interfaces/innerkits/wm/wm_common.h @@ -43,7 +43,6 @@ enum class WindowType : uint32_t { ABOVE_APP_SYSTEM_WINDOW_BASE = 2100, WINDOW_TYPE_APP_LAUNCHING = ABOVE_APP_SYSTEM_WINDOW_BASE, WINDOW_TYPE_DOCK_SLICE, - WINDOW_TYPE_PLACEHOLDER, WINDOW_TYPE_INCOMING_CALL, WINDOW_TYPE_SEARCHING_BAR, WINDOW_TYPE_SYSTEM_ALARM_WINDOW, @@ -63,6 +62,7 @@ enum class WindowType : uint32_t { WINDOW_TYPE_FREEZE_DISPLAY, WINDOW_TYPE_VOICE_INTERACTION, WINDOW_TYPE_FLOAT_CAMERA, + WINDOW_TYPE_PLACEHOLDER, ABOVE_APP_SYSTEM_WINDOW_END, SYSTEM_WINDOW_END = ABOVE_APP_SYSTEM_WINDOW_END, }; diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp index 926627e3..e9e9954a 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp @@ -208,7 +208,7 @@ void JsWindowListener::OnSizeChange(const sptr& info) *engine_, std::make_unique(callback, std::move(execute), std::move(complete))); } -void JsWindowListener::OnTouchOutside() +void JsWindowListener::OnTouchOutside() const { std::unique_ptr complete = std::make_unique ( [self = weakRef_] (NativeEngine &engine, AsyncTask &task, int32_t status) { diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.h b/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.h index e1d59458..617a1be2 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.h +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.h @@ -58,7 +58,7 @@ public: void AfterFocused() override; void AfterUnfocused() override; void OnSizeChange(const sptr& info) override; - void OnTouchOutside() override; + void OnTouchOutside() const override; void CallJsMethod(const char* methodName, NativeValue* const* argv = nullptr, size_t argc = 0); private: void LifeCycleCallBack(LifeCycleEventType eventType); diff --git a/resources/config/rk3568/window_manager_config.xml b/resources/config/rk3568/window_manager_config.xml index a0489639..db2b08f9 100644 --- a/resources/config/rk3568/window_manager_config.xml +++ b/resources/config/rk3568/window_manager_config.xml @@ -15,7 +15,7 @@ --> - + 100 diff --git a/utils/src/surface_draw.cpp b/utils/src/surface_draw.cpp index 0cdc7827..cb6a44dc 100644 --- a/utils/src/surface_draw.cpp +++ b/utils/src/surface_draw.cpp @@ -165,7 +165,7 @@ bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, const s { OHOS::Rosen::Drawing::Bitmap bitmap; OHOS::Rosen::Drawing::BitmapFormat format { OHOS::Rosen::Drawing::ColorType::COLORTYPE_RGBA_8888, - OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUYE }; + OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUE }; bitmap.Build(width, height, format); OHOS::Rosen::Drawing::Canvas canvas; canvas.Bind(bitmap); @@ -185,7 +185,7 @@ bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, uint32_ { OHOS::Rosen::Drawing::Bitmap bitmap; OHOS::Rosen::Drawing::BitmapFormat format { OHOS::Rosen::Drawing::ColorType::COLORTYPE_RGBA_8888, - OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUYE }; + OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUE }; bitmap.Build(width, height, format); OHOS::Rosen::Drawing::Canvas canvas; canvas.Bind(bitmap); @@ -239,7 +239,7 @@ bool SurfaceDraw::DoDrawImageRect(uint8_t *addr, int32_t winWidth, int32_t winHe { OHOS::Rosen::Drawing::Bitmap bitmap; OHOS::Rosen::Drawing::BitmapFormat format { OHOS::Rosen::Drawing::ColorType::COLORTYPE_RGBA_8888, - OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUYE }; + OHOS::Rosen::Drawing::AlphaType::ALPHATYPE_OPAQUE }; bitmap.Build(winWidth, winHeight, format); OHOS::Rosen::Drawing::Canvas canvas; canvas.Bind(bitmap); diff --git a/wmserver/include/inner_window.h b/wmserver/include/inner_window.h index ec85ff94..3fb48622 100644 --- a/wmserver/include/inner_window.h +++ b/wmserver/include/inner_window.h @@ -31,7 +31,7 @@ public: class PlaceholderWindowListener : public IWindowLifeCycle, public ITouchOutsideListener, public IInputEventListener { public: // touch outside listener - virtual void OnTouchOutside(); + virtual void OnTouchOutside() const; // input event listener virtual void OnKeyEvent(std::shared_ptr& keyEvent); virtual void OnPointerInputEvent(std::shared_ptr& pointerEvent); diff --git a/wmserver/src/inner_window.cpp b/wmserver/src/inner_window.cpp index e5d1a0e2..5033e6e6 100644 --- a/wmserver/src/inner_window.cpp +++ b/wmserver/src/inner_window.cpp @@ -28,7 +28,7 @@ namespace { WM_IMPLEMENT_SINGLE_INSTANCE(PlaceHolderWindow) WM_IMPLEMENT_SINGLE_INSTANCE(DividerWindow) -void PlaceholderWindowListener::OnTouchOutside() +void PlaceholderWindowListener::OnTouchOutside() const { WLOGFD("place holder touch outside"); PlaceHolderWindow::GetInstance().Destroy();