一些显示优化; Windows切换设置窗口崩溃

okstar-org · Aug 5, 2024 · f02ba30 · f02ba30
1 parent aeef646
commit f02ba30
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/src/UI/widget/OMenuWidget.h b/src/UI/widget/OMenuWidget.h
@@ -40,6 +40,6 @@ class OMenuWidget : public QFrame {
     }
 
 private:
-    Module* module;
+    Module* module = nullptr;
 };
 }  // namespace UI
diff --git a/src/UI/window/main/qss/menu.css b/src/UI/window/main/qss/menu.css
@@ -9,6 +9,7 @@ QPushButton {
 	border-radius: 12px;
 	width: 52px;
 	height: 52px;
+	outline: none;
 }
 
 QPushButton#chatBtn,

diff --git a/src/UI/window/main/src/MainWindow.cpp b/src/UI/window/main/src/MainWindow.cpp
@@ -383,6 +383,7 @@ OMenuWidget* MainWindow::createChatModule(MainWindow* pWindow) {
     auto w = new OMenuWidget(this);
     w->setModule(m);
     w->setLayout(new QGridLayout());
+    w->layout()->setContentsMargins(0, 0, 0, 0);
     w->layout()->addWidget(m->widget());
     return w;
 }
@@ -393,6 +394,7 @@ OMenuWidget* MainWindow::createPlatformModule(MainWindow* pWindow) {
     auto w = new OMenuWidget(this);
     w->setModule(m);
     w->setLayout(new QGridLayout());
+    w->layout()->setContentsMargins(0, 0, 0, 0);
     w->layout()->addWidget(m->widget());
 
     return w;

diff --git a/src/modules/im/src/widget/friendlistwidget.cpp b/src/modules/im/src/widget/friendlistwidget.cpp
@@ -51,8 +51,6 @@ FriendListWidget::FriendListWidget(MainLayout* parent, ContentLayout* contentLay
 
     // Prevent QLayout's add child warning before setting the mode.
     listLayout = new FriendListLayout(this);
-    listLayout->removeItem(listLayout->getLayoutOnline());
-    listLayout->removeItem(listLayout->getLayoutOffline());
     setLayout(listLayout);
 
     mode = Settings::getInstance().getFriendSortingMode();

diff --git a/src/modules/im/src/widget/genericchatitemwidget.cpp b/src/modules/im/src/widget/genericchatitemwidget.cpp
@@ -14,6 +14,8 @@
 #include <src/core/core.h>
 #include <src/friendlist.h>
 #include <src/nexus.h>
+#include <QIcon>
+#include <QSvgRenderer>
 #include <QVariant>
 #include "maskablepixmapwidget.h"
 #include "src/lib/settings/style.h"
@@ -75,7 +77,12 @@ void GenericChatItemWidget::searchName(const QString& searchString, bool hide) {
     setVisible(!hide && getName().contains(searchString, Qt::CaseInsensitive));
 }
 
-void GenericChatItemWidget::setLastMessage(const QString& msg) { lastMessageLabel->setText(msg); }
+void GenericChatItemWidget::setLastMessage(const QString& msg) {
+    if (msg.contains(QChar('\n')))
+        lastMessageLabel->setText(QString(msg).replace(QChar('\n'), QChar(' ')));
+    else
+        lastMessageLabel->setText(msg);
+}
 
 void GenericChatItemWidget::updateLastMessage(const Message& m) {
     QString prefix;
@@ -102,7 +109,10 @@ void GenericChatItemWidget::updateStatusLight(Status::Status status, bool event)
     auto pix = Status::getIconPath(status, event);
     if (pix.isEmpty()) return;
 
-    statusPic->setPixmap(QPixmap(pix));
+    // 图片是svg格式，按照原有逻辑先获取默认尺寸
+    QSvgRenderer svgrender(pix);
+    QSize s = svgrender.defaultSize();
+    statusPic->setPixmap(QIcon(pix).pixmap(this->window()->windowHandle(), s));
 }
 
 void GenericChatItemWidget::clearStatusLight() { statusPic->clear(); }