回退部分错误代码

This commit is contained in:
zhanglei 2024-03-07 19:41:33 +08:00
parent 9d34d9f89a
commit 204b1dcef8
3 changed files with 18 additions and 5 deletions

View File

@ -107,12 +107,15 @@ void viewControl::showInCenter(QWidget *w)
w->setVisible(true); w->setVisible(true);
// wayland下居中显示 // wayland下居中显示
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
if (ViewVar::getInstance()->m_currentMode == CurrentMode::PadHMode){ //回退部分代码
/*if (ViewVar::getInstance()->m_currentMode == CurrentMode::PadHMode){
w->showFullScreen(); w->showFullScreen();
} }
else{ else{
::kabase::WindowManage::setMiddleOfScreen(w); ::kabase::WindowManage::setMiddleOfScreen(w);
} }
*/
::kabase::WindowManage::setMiddleOfScreen(w);
} else { } else {
QDesktopWidget *m = QApplication::desktop(); QDesktopWidget *m = QApplication::desktop();
QRect desk_rect = m->screenGeometry(m->screenNumber(QCursor::pos())); QRect desk_rect = m->screenGeometry(m->screenNumber(QCursor::pos()));

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
kylin-weather (3.2.0.3-ok16) yangtze; urgency=medium
* BUG: 无
* 任务号:无
* 需求号:无
* 其他改动说明:回退部分错误代码
* 其他改动影响域:无
-- zhanglei01 <zhanglei01@kylinos.cn> Thu, 07 Mar 2024 19:40:36 +0800
kylin-weather (3.2.0.3-ok15) yangtze; urgency=medium kylin-weather (3.2.0.3-ok15) yangtze; urgency=medium
* BUG#I82NO5 【Wayland】【平板】【天气】天气应用点击右上角的“帮助”后跳转到登录界面 * BUG#I82NO5 【Wayland】【平板】【天气】天气应用点击右上角的“帮助”后跳转到登录界面

View File

@ -1018,10 +1018,10 @@ void horscreen::slotChangePCMode()
m_cityR->slotChangePCMode(); m_cityR->slotChangePCMode();
m_cityL->move(-this->width(), 0); m_cityL->move(-this->width(), 0);
m_cityR->move(this->width(), 0); m_cityR->move(this->width(), 0);
this->showMaximized(); // this->showMaximized();
if (ViewVar::widgetIsShow == false){ // if (ViewVar::widgetIsShow == false){
this->hide(); // this->hide();
} // }
return; return;
} }