diff --git a/wayland_adapter/framework/unstable/wayland_zxdg_output_manager_v1.cpp b/wayland_adapter/framework/unstable/wayland_zxdg_output_manager_v1.cpp index bd3f14bc15299c4401490ee84de0e08fe98d3301..78f16da385a1488159525f90862511f24f23cfcb 100644 --- a/wayland_adapter/framework/unstable/wayland_zxdg_output_manager_v1.cpp +++ b/wayland_adapter/framework/unstable/wayland_zxdg_output_manager_v1.cpp @@ -86,7 +86,7 @@ void WaylandZxdgOutputManagerObject::GetZxdgOutput(struct wl_client *client, str LOG_ERROR("WaylandZxdgOutputManagerObject GetZxdgOutput failed."); return; } - + Send(xdgOutput); } void WaylandZxdgOutputManagerObject::Send(const OHOS::sptr &xdgOutput) diff --git a/wayland_adapter/utils/include/wayalnd_utils.h b/wayland_adapter/utils/include/wayalnd_utils.h index 99e2f41876080cdb83dbf1b63922832b3fb59774..666aba4d32166be65d6d2632c8eb17f38d79167e 100644 --- a/wayland_adapter/utils/include/wayalnd_utils.h +++ b/wayland_adapter/utils/include/wayalnd_utils.h @@ -85,6 +85,8 @@ enum class SurfaceRole : uint32_t { static SkColorType ShmFormatToSkia(const uint32_t& shmFormat) { switch (shmFormat) { + case WL_SHM_FORMAT_ARGB8888: + return SkColorType::kBGRA_8888_SkColorType; case WL_SHM_FORMAT_RGBA8888: return SkColorType::kRGBA_8888_SkColorType; default: diff --git a/wayland_adapter/wayland_server.cpp b/wayland_adapter/wayland_server.cpp index 658d34a13d753ca8a8f9cfecb7d558434d3a3039..e420ab4b4c559ca0bb94cbf31eb7df2eaa7c74a1 100644 --- a/wayland_adapter/wayland_server.cpp +++ b/wayland_adapter/wayland_server.cpp @@ -41,6 +41,7 @@ void WaylandServer::CreateGlobalObjects() outputGlobal_ = WaylandOutput::Create(display_); seatGlobal_ = WaylandSeat::Create(display_); subCompositorGlobal_ = WaylandSubCompositor::Create(display_); + zxdgOutputMgrGlobal_ = WaylandZxdgOutputManagerV1::Create(display_); wl_display_add_shm_format(display_, WL_SHM_FORMAT_RGBA8888); wl_display_init_shm(display_); } diff --git a/wayland_adapter/wayland_server.h b/wayland_adapter/wayland_server.h index 350688a2f10cd1f46d4508ebbb87e5557ee6ccfb..87c2b571411b51bbe3d5109038d3772a80d36ae9 100644 --- a/wayland_adapter/wayland_server.h +++ b/wayland_adapter/wayland_server.h @@ -26,6 +26,7 @@ #include "wayland_output.h" #include "wayland_seat.h" #include "wayland_subcompositor.h" +#include "wayland_zxdg_output_manager_v1.h" namespace FT { namespace Wayland { @@ -56,6 +57,7 @@ private: OHOS::sptr outputGlobal_; OHOS::sptr seatGlobal_; OHOS::sptr subCompositorGlobal_; + OHOS::sptr zxdgOutputMgrGlobal_; }; } // namespace Wayland } // namespace FT