openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2025-05-13 06:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!12232 强制限制最小值小于系统限制最小值时，以系统最小值为准

Browse Source 
Merge pull request !12232 from tanchenghao/limit
This commit is contained in:
openharmony_ci 2025-01-20 03:35:29 +00:00 committed by Gitee
commit 205700812d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wm/src/window_scene_session_impl.cpp
View File

@ -983,8 +983,10 @@ void WindowSceneSessionImpl::CalculateNewLimitsByLimits(
uint32_t limitMinWidth = systemLimits.minWidth_;
uint32_t limitMinHeight = systemLimits.minHeight_;
if (forceLimits_ && windowSystemConfig_.IsPcWindow()) {
limitMinWidth = static_cast<uint32_t>(FORCE_LIMIT_MIN_FLOATING_WIDTH * virtualPixelRatio);
limitMinHeight = static_cast<uint32_t>(FORCE_LIMIT_MIN_FLOATING_HEIGHT * virtualPixelRatio);
uint32_t forceLimitMinWidth = static_cast<uint32_t>(FORCE_LIMIT_MIN_FLOATING_WIDTH * virtualPixelRatio);
uint32_t forceLimitMinHeight = static_cast<uint32_t>(FORCE_LIMIT_MIN_FLOATING_HEIGHT * virtualPixelRatio);
limitMinWidth = std::min(forceLimitMinWidth, limitMinWidth);
limitMinHeight = std::min(forceLimitMinHeight, limitMinHeight);
newLimits.minWidth_ = limitMinWidth;
newLimits.minHeight_ = limitMinHeight;
}