openkylin
/
ukui-menu
mirror of https://gitee.com/openkylin/ukui-menu.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

!31 解决任务栏位置调整后全屏开始菜单位置错误问题 

Merge pull request !31 from lixueman/upstream
This commit is contained in:
lixueman 2022-11-24 01:19:32 +00:00 committed by Gitee
parent 88486df649 e4f9c154aa
commit 8fc2f87f76
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UserInterface/mainwindow.cpp
View File

@ -770,7 +770,6 @@ void MainWindow::minAnimationFinished()
m_viewWidget->setFocus(); m_viewWidget->setFocus();
// m_collectPushButton->clicked(true); // m_collectPushButton->clicked(true);
on_collectPushButton_clicked(); on_collectPushButton_clicked();
QTimer::singleShot(200, [ = ]() { QTimer::singleShot(200, [ = ]() {
m_animationPage->hide(); m_animationPage->hide();
}); });
@ -791,6 +790,7 @@ void MainWindow::maxAnimationFinished()
setMaxWindowPos(); setMaxWindowPos();
m_fullWindow->activateWindow(); m_fullWindow->activateWindow();
QTimer::singleShot(200, [ = ]() { QTimer::singleShot(200, [ = ]() {
m_animationPage->hide(); m_animationPage->hide();
}); });
@ -1370,7 +1370,7 @@ void MainWindow::setMinWindowPos()
void MainWindow::setMaxWindowPos() void MainWindow::setMaxWindowPos()
{ {
if (g_platform.startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { if (g_platform.startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
kdk::WindowManager::setGeometry(m_fullWindow->windowHandle(), QRect(0, 0, Style::m_availableScreenWidth, Style::m_availableScreenHeight)); kdk::WindowManager::setGeometry(m_fullWindow->windowHandle(), QRect(Style::m_primaryScreenX, Style::m_primaryScreenY, Style::m_availableScreenWidth, Style::m_availableScreenHeight));
} }
} }