diff --git a/BUILD.gn b/BUILD.gn index 219a92cedb402fb590a886b0af3f9486f52db95e..7aa989d686fac1b587d54d43c6183773386970f5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -60,7 +60,6 @@ shared_library("ui") { "frameworks/common/image.cpp", "frameworks/common/input_device_manager.cpp", "frameworks/common/screen.cpp", - "frameworks/common/screen_device_proxy.cpp", "frameworks/common/task.cpp", "frameworks/common/text.cpp", "frameworks/common/typed_text.cpp", @@ -114,6 +113,7 @@ shared_library("ui") { "frameworks/dock/ohos/ohos_input_device.cpp", "frameworks/dock/pointer_input_device.cpp", "frameworks/dock/rotate_input_device.cpp", + "frameworks/dock/screen_device_proxy.cpp", "frameworks/dock/virtual_input_device.cpp", "frameworks/draw/draw_arc.cpp", "frameworks/draw/draw_curve.cpp", diff --git a/frameworks/common/screen_device_proxy.cpp b/frameworks/dock/screen_device_proxy.cpp similarity index 100% rename from frameworks/common/screen_device_proxy.cpp rename to frameworks/dock/screen_device_proxy.cpp diff --git a/interfaces/kits/dfx/ui_screenshot.h b/interfaces/kits/dfx/ui_screenshot.h index a800bf22591221cb3acad2e3899487a5f729b63d..084a61dc3027727eeea8427e1d5a64e529306787 100755 --- a/interfaces/kits/dfx/ui_screenshot.h +++ b/interfaces/kits/dfx/ui_screenshot.h @@ -79,7 +79,6 @@ public: * @version 1.0 */ bool ScreenshotToFile(const char* path); - private: UIScreenshotListener* screenshotListener_; diff --git a/tools/qt/simulator/libui/libui.pro b/tools/qt/simulator/libui/libui.pro old mode 100755 new mode 100644 index afa785c3d4b5b996d7052fe4e528c37c3de512f7..16429fdbb6c7dedc6e1ff1d7abd33b2a0c08c1ef --- a/tools/qt/simulator/libui/libui.pro +++ b/tools/qt/simulator/libui/libui.pro @@ -28,7 +28,6 @@ SOURCES += \ ../../../../frameworks/common/image.cpp \ ../../../../frameworks/common/input_device_manager.cpp \ ../../../../frameworks/common/screen.cpp \ - ../../../../frameworks/common/screen_device_proxy.cpp \ ../../../../frameworks/common/task.cpp \ ../../../../frameworks/common/text.cpp \ ../../../../frameworks/common/typed_text.cpp \ @@ -78,6 +77,7 @@ SOURCES += \ ../../../../frameworks/dock/key_input_device.cpp \ ../../../../frameworks/dock/pointer_input_device.cpp \ ../../../../frameworks/dock/rotate_input_device.cpp \ + ../../../../frameworks/dock/screen_device_proxy.cpp \ ../../../../frameworks/dock/virtual_input_device.cpp \ ../../../../frameworks/draw/draw_arc.cpp \ ../../../../frameworks/draw/draw_curve.cpp \ diff --git a/ui.gni b/ui.gni index baf26af1f943d66a6d8ede71699bb724b9bd390b..b2f20872caef8da02d49a8c0a71e214d28019da7 100644 --- a/ui.gni +++ b/ui.gni @@ -24,7 +24,6 @@ graphic_ui_sources = [ "$GRAPHIC_UI_PATH/frameworks/common/image.cpp", "$GRAPHIC_UI_PATH/frameworks/common/input_device_manager.cpp", "$GRAPHIC_UI_PATH/frameworks/common/screen.cpp", - "$GRAPHIC_UI_PATH/frameworks/common/screen_device_proxy.cpp", "$GRAPHIC_UI_PATH/frameworks/common/task.cpp", "$GRAPHIC_UI_PATH/frameworks/common/text.cpp", "$GRAPHIC_UI_PATH/frameworks/common/typed_text.cpp", @@ -72,6 +71,7 @@ graphic_ui_sources = [ "$GRAPHIC_UI_PATH/frameworks/dock/input_device.cpp", "$GRAPHIC_UI_PATH/frameworks/dock/key_input_device.cpp", "$GRAPHIC_UI_PATH/frameworks/dock/pointer_input_device.cpp", + "$GRAPHIC_UI_PATH/frameworks/dock/screen_device_proxy.cpp", "$GRAPHIC_UI_PATH/frameworks/dock/virtual_input_device.cpp", "$GRAPHIC_UI_PATH/frameworks/draw/draw_arc.cpp", "$GRAPHIC_UI_PATH/frameworks/draw/draw_curve.cpp",