mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-03 22:28:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1073 from barry-ran/dev
Some checks failed
MacOS / Build (push) Has been cancelled
Details
Ubuntu / Build (push) Has been cancelled
Details
Windows / Build (push) Has been cancelled
Details

Browse source 
sync dev
This commit is contained in:
Barry 2024-12-07 17:26:04 +08:00 • committed by GitHub
commit ec5f413a38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
QtScrcpy/QtScrcpyCore

@ -1 +1 @@
Subproject commit eb8b7837b18d4d2c13276d90884feb7f1c37d7ba Subproject commit 8e2cc1f3b17ad888b567ce05c5fe125bcaca0dd5

4
QtScrcpy/groupcontroller/groupcontroller.cpp
View file

@ -262,7 +262,7 @@ void GroupController::postCut()
} }
} }
void GroupController::setScreenPowerMode(bool open) void GroupController::setDisplayPower(bool on)
{ {
for (const auto& serial : m_devices) { for (const auto& serial : m_devices) {
if (true == isHost(serial)) { if (true == isHost(serial)) {
@ -273,7 +273,7 @@ void GroupController::setScreenPowerMode(bool open)
continue; continue;
} }
device->setScreenPowerMode(open); device->setDisplayPower(on);
} }
} }

2
QtScrcpy/groupcontroller/groupcontroller.h
View file

@ -31,7 +31,7 @@ private:
void postVolumeDown() override; void postVolumeDown() override;
void postCopy() override; void postCopy() override;
void postCut() override; void postCut() override;
void setScreenPowerMode(bool open) override; void setDisplayPower(bool on) override;
void expandNotificationPanel() override; void expandNotificationPanel() override;
void collapsePanel() override; void collapsePanel() override;
void postBackOrScreenOn(bool down) override; void postBackOrScreenOn(bool down) override;

4
QtScrcpy/ui/toolform.cpp
View file

@ -186,7 +186,7 @@ void ToolForm::on_closeScreenBtn_clicked()
if (!device) { if (!device) {
return; return;
} }
device->setScreenPowerMode(false); device->setDisplayPower(false);
} }
void ToolForm::on_expandNotifyBtn_clicked() void ToolForm::on_expandNotifyBtn_clicked()
@ -221,5 +221,5 @@ void ToolForm::on_openScreenBtn_clicked()
if (!device) { if (!device) {
return; return;
} }
device->setScreenPowerMode(true); device->setDisplayPower(true);
} }

2
QtScrcpy/ui/videoform.cpp
View file

@ -290,7 +290,7 @@ void VideoForm::installShortcut()
if (!device) { if (!device) {
return; return;
} }
emit device->setScreenPowerMode(false); emit device->setDisplayPower(false);
}); });
// expandNotificationPanel // expandNotificationPanel

2
ci/mac/build_for_mac.sh
View file

@ -58,7 +58,7 @@ fi
mkdir $build_path mkdir $build_path
cd $build_path cd $build_path
cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64" cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=10.10"
cmake $cmake_params ../.. cmake $cmake_params ../..
if [ $? -ne 0 ] ;then if [ $? -ne 0 ] ;then
echo "cmake failed" echo "cmake failed"