mirror of
https://gitee.com/openharmony/window_window_manager
synced 2024-11-24 07:20:09 +00:00
warning 整改
Signed-off-by: xpeng <pengxin33@huawei.com> Change-Id: Ie24c946baac55eb19bfc7434c97d4a8914264736
This commit is contained in:
parent
02d383fcb4
commit
d775f2b225
@ -99,8 +99,8 @@ int32_t DisplayManagerAgentStub::OnRemoteRequest(uint32_t code, MessageParcel& d
|
|||||||
case TRANS_ID_ON_DISPLAY_DISCONNECT: {
|
case TRANS_ID_ON_DISPLAY_DISCONNECT: {
|
||||||
DisplayId displayId;
|
DisplayId displayId;
|
||||||
if (!data.ReadUint64(displayId)) {
|
if (!data.ReadUint64(displayId)) {
|
||||||
return -1;
|
|
||||||
WLOGFE("Read DisplayId failed");
|
WLOGFE("Read DisplayId failed");
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
OnDisplayDestroy(displayId);
|
OnDisplayDestroy(displayId);
|
||||||
break;
|
break;
|
||||||
|
@ -278,8 +278,11 @@ DeviceRotation ScreenRotationController::CalcDeviceRotation(SensorRotation senso
|
|||||||
}
|
}
|
||||||
if (defaultDeviceRotation_ == 1) {
|
if (defaultDeviceRotation_ == 1) {
|
||||||
deviceRotationValue += defaultDeviceRotation_;
|
deviceRotationValue += defaultDeviceRotation_;
|
||||||
// if device's default rotation is landscape, swap 0 and 90, 180 and 270, use %2 to adjust range.
|
// %2 to determine whether the rotation is horizontal or vertical.
|
||||||
(deviceRotationValue % 2 == 0) && (deviceRotationValue -= 2);
|
if (deviceRotationValue % 2 == 0) {
|
||||||
|
// if device's default rotation is landscape, use -2 to swap 0 and 90, 180 and 270.
|
||||||
|
deviceRotationValue -= 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return static_cast<DeviceRotation>(deviceRotationValue);
|
return static_cast<DeviceRotation>(deviceRotationValue);
|
||||||
}
|
}
|
||||||
|
@ -325,7 +325,6 @@ void DisplayZoomController::HandleUpdateWindowZoomInfo(sptr<WindowNode> node)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Transform zoomTrans;
|
Transform zoomTrans;
|
||||||
Transform animateTrans = node->GetWindowProperty()->GetTransform();
|
|
||||||
if (node->GetWindowProperty()->IsAnimateWindow()) {
|
if (node->GetWindowProperty()->IsAnimateWindow()) {
|
||||||
zoomTrans = CalcuAnimateZoomTrans(node);
|
zoomTrans = CalcuAnimateZoomTrans(node);
|
||||||
} else {
|
} else {
|
||||||
|
@ -277,7 +277,6 @@ void WindowDumper::ShowHelpInfo(std::string& dumpInfo) const
|
|||||||
|
|
||||||
void WindowDumper::ShowAceDumpHelp(std::string& dumpInfo) const
|
void WindowDumper::ShowAceDumpHelp(std::string& dumpInfo) const
|
||||||
{
|
{
|
||||||
std::vector<std::string> infos;
|
|
||||||
auto node = windowRoot_->GetWindowForDumpAceHelpInfo();
|
auto node = windowRoot_->GetWindowForDumpAceHelpInfo();
|
||||||
if (node == nullptr) {
|
if (node == nullptr) {
|
||||||
WLOGFE("invalid window");
|
WLOGFE("invalid window");
|
||||||
|
Loading…
Reference in New Issue
Block a user