openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-19 17:08:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

!120 修改分屏条宽度及热区

Browse Source 
Merge pull request !120 from liuqi/master
This commit is contained in:
openharmony_ci
2022-01-20 08:53:51 +00:00
committed by Gitee
parent 2959645241 717c2dbd09
commit d4a19b46ea
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/innerkits/wm/wm_common.h
+1
View File
@@ -97,6 +97,7 @@ namespace {
constexpr uint32_t SYSTEM_COLOR_WHITE = 0xFFFFFFE5;
constexpr uint32_t SYSTEM_COLOR_BLACK = 0x00000066;
constexpr float DEFAULT_SPLIT_RATIO = 0.5;
constexpr uint32_t DIVIDER_WIDTH = 8;
}
struct SystemBarProperty {
wm/test/systemtest/window_test_utils.cpp
+4 -5
View File
@@ -163,16 +163,15 @@ void WindowTestUtils::InitSplitRects()
if (displayRect_.width_ < displayRect_.height_) {
isVerticalDisplay_ = true;
}
const uint32_t dividerWidth = 50;
if (isVerticalDisplay_) {
splitRects_.dividerRect = { 0,
static_cast<uint32_t>((displayRect_.height_ - dividerWidth) * DEFAULT_SPLIT_RATIO),
static_cast<uint32_t>((displayRect_.height_ - DIVIDER_WIDTH) * DEFAULT_SPLIT_RATIO),
displayRect_.width_,
dividerWidth, };
DIVIDER_WIDTH, };
} else {
splitRects_.dividerRect = { static_cast<uint32_t>((displayRect_.width_ - dividerWidth) * DEFAULT_SPLIT_RATIO),
splitRects_.dividerRect = { static_cast<uint32_t>((displayRect_.width_ - DIVIDER_WIDTH) * DEFAULT_SPLIT_RATIO),
0,
dividerWidth,
DIVIDER_WIDTH,
displayRect_.height_ };
}
}
wmserver/src/input_window_monitor.cpp
+10
View File
@@ -147,6 +147,16 @@ void InputWindowMonitor::TraverseWindowNodes(const std::vector<sptr<WindowNode>>
.displayId = windowNode->GetDisplayId(),
.agentWindowId = static_cast<int32_t>(windowNode->GetWindowId()),
};
if (windowNode->GetWindowType() == WindowType::WINDOW_TYPE_DOCK_SLICE) {
const int32_t divTouchRegion = 20;
if (windowInfo.width < windowInfo.height) {
windowInfo.topLeftX -= divTouchRegion;
windowInfo.width += (divTouchRegion + divTouchRegion);
} else {
windowInfo.topLeftY -= divTouchRegion;
windowInfo.height += (divTouchRegion + divTouchRegion);
}
}
iter->windowsInfo_.emplace_back(windowInfo);
}
}
wmserver/src/window_node_container.cpp
+4 -5
View File
@@ -500,13 +500,12 @@ void WindowNodeContainer::DisplayRects::InitRect(Rect& oriDisplayRect)
isVertical_ = true;
}
displayRect_ = oriDisplayRect;
const uint32_t dividerWidth = 50;
if (!isVertical_) {
dividerRect_ = { static_cast<uint32_t>((displayRect_.width_ - dividerWidth) * DEFAULT_SPLIT_RATIO), 0,
dividerWidth, displayRect_.height_ };
dividerRect_ = { static_cast<uint32_t>((displayRect_.width_ - DIVIDER_WIDTH) * DEFAULT_SPLIT_RATIO), 0,
DIVIDER_WIDTH, displayRect_.height_ };
} else {
dividerRect_ = { 0, static_cast<uint32_t>((displayRect_.height_ - dividerWidth) * DEFAULT_SPLIT_RATIO),
displayRect_.width_, dividerWidth };
dividerRect_ = { 0, static_cast<uint32_t>((displayRect_.height_ - DIVIDER_WIDTH) * DEFAULT_SPLIT_RATIO),
displayRect_.width_, DIVIDER_WIDTH };
}
WLOGFI("init dividerRect :[%{public}d, %{public}d, %{public}d, %{public}d]",
dividerRect_.posX_, dividerRect_.posY_, dividerRect_.width_, dividerRect_.height_);