From 204b1dcef867bef72b3e5f3d7147df27ecd6bd35 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Thu, 7 Mar 2024 19:41:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E9=83=A8=E5=88=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/core/viewcontrol.cpp | 5 ++++- debian/changelog | 10 ++++++++++ view/horscreen/horscreen.cpp | 8 ++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/controller/core/viewcontrol.cpp b/controller/core/viewcontrol.cpp index 5596136..ee64e34 100644 --- a/controller/core/viewcontrol.cpp +++ b/controller/core/viewcontrol.cpp @@ -107,12 +107,15 @@ void viewControl::showInCenter(QWidget *w) w->setVisible(true); // wayland下居中显示 if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { - if (ViewVar::getInstance()->m_currentMode == CurrentMode::PadHMode){ + //回退部分代码 + /*if (ViewVar::getInstance()->m_currentMode == CurrentMode::PadHMode){ w->showFullScreen(); } else{ ::kabase::WindowManage::setMiddleOfScreen(w); } + */ + ::kabase::WindowManage::setMiddleOfScreen(w); } else { QDesktopWidget *m = QApplication::desktop(); QRect desk_rect = m->screenGeometry(m->screenNumber(QCursor::pos())); diff --git a/debian/changelog b/debian/changelog index f65bf15..c09ac52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +kylin-weather (3.2.0.3-ok16) yangtze; urgency=medium + + * BUG: 无 + * 任务号:无 + * 需求号:无 + * 其他改动说明:回退部分错误代码 + * 其他改动影响域:无 + + -- zhanglei01 Thu, 07 Mar 2024 19:40:36 +0800 + kylin-weather (3.2.0.3-ok15) yangtze; urgency=medium * BUG:#I82NO5 【Wayland】【平板】【天气】天气应用点击右上角的“帮助”后跳转到登录界面 diff --git a/view/horscreen/horscreen.cpp b/view/horscreen/horscreen.cpp index e523320..00ab036 100644 --- a/view/horscreen/horscreen.cpp +++ b/view/horscreen/horscreen.cpp @@ -1018,10 +1018,10 @@ void horscreen::slotChangePCMode() m_cityR->slotChangePCMode(); m_cityL->move(-this->width(), 0); m_cityR->move(this->width(), 0); - this->showMaximized(); - if (ViewVar::widgetIsShow == false){ - this->hide(); - } +// this->showMaximized(); +// if (ViewVar::widgetIsShow == false){ +// this->hide(); +// } return; }