fix: 完全正式支持 wayland ；

Wing-summer · Wing-summer · commit b9f55cc91b04 · 2025-11-15T21:30:42.000+08:00
diff --git a/3rdparty/AngelScript b/3rdparty/AngelScript
@@ -1 +1 @@
-Subproject commit 365b8fb559e9ba075d77cbd5a9a9761a73e6d5c1
+Subproject commit 8b6fbd6d5285ae41d94f77c5794bb339683c7eea
diff --git a/3rdparty/Qt-Advanced-Docking-System b/3rdparty/Qt-Advanced-Docking-System
@@ -1 +1 @@
-Subproject commit 5bd5a39d276f3a5482cfc9d734b4f910a42ed5da
+Subproject commit 5de8f90eedaef638c362200e1e78304d04d5d8a7
diff --git a/3rdparty/as-debugger/as_debugger.cpp b/3rdparty/as-debugger/as_debugger.cpp
@@ -1211,17 +1211,43 @@ void asIDBFileWorkspace::CompileBreakpointPositions() {
                     // Check if a given breakpoint fall on a line with code or
                     // else adjust it to the next line
                     if (bp.needAdjust) {
-                        int line = func->FindNextLineWithCode(bp.line);
-                        if (line >= 0) {
+                        // Use GetLineEntryCount and GetLineEntry to build a
+                        // list of valid lines This will also work for functions
+                        // compiled from multiple sections, e.g. inlined
+                        // functions, injected code, etc.
+                        int lowestLine = bp.line + 1;
+                        int nextLine = bp.line - 1;
+
+                        // The function may be declared earlier than the
+                        // breakpoint even though the first line of code is only
+                        // after it
+                        int row;
+                        const char *sectionName;
+                        func->GetDeclaredAt(&sectionName, &row, 0);
+
+                        if (row < lowestLine)
+                            lowestLine = row;
+
+                        int lineEntries = func->GetLineEntryCount();
+                        for (int i = 0; i < lineEntries; i++) {
+                            func->GetLineEntry(i, &row, 0, &sectionName, 0);
+                            if (row < lowestLine)
+                                lowestLine = row;
+                            if (row >= bp.line &&
+                                (row < nextLine || nextLine < bp.line))
+                                nextLine = row;
+                        }
+
+                        if (lowestLine <= bp.line && nextLine >= bp.line) {
                             bp.needAdjust = false;
-                            if (line != bp.line) {
+                            if (nextLine != bp.line) {
                                 // Moving break point to next line with code
                                 auto old = bp.line;
                                 // Move the breakpoint to the next line
-                                bp.line = line;
+                                bp.line = nextLine;
 
                                 if (debugger->onAdjustBreakPoint) {
-                                    debugger->onAdjustBreakPoint(old, line,
+                                    debugger->onAdjustBreakPoint(old, nextLine,
                                                                  section);
                                 }
                             }
@@ -1246,12 +1272,14 @@ void asIDBFileWorkspace::CompileBreakpointPositions() {
             auto func = ctx->GetFunction(0);
 
             if (func) {
-                func->GetDeclaredAt(nullptr, &decl_row, nullptr);
-
                 if (debugger->function_breakpoints.find(func->GetName()) !=
-                        debugger->function_breakpoints.end() &&
-                    row == func->FindNextLineWithCode(decl_row))
-                    break_from_bp = true;
+                    debugger->function_breakpoints.end()) {
+                    auto curRow = 0;
+                    func->GetLineEntry(0, &curRow, nullptr, nullptr, nullptr);
+                    if (curRow == row) {
+                        break_from_bp = true;
+                    }
+                }
             }
         }
     }
diff --git a/lang/en_US/winghex_en_US.ts b/lang/en_US/winghex_en_US.ts
diff --git a/lang/zh_CN/winghex_zh_CN.ts b/lang/zh_CN/winghex_zh_CN.ts
diff --git a/lang/zh_TW/winghex_zh_TW.ts b/lang/zh_TW/winghex_zh_TW.ts
diff --git a/mkinstaller/config.ini b/mkinstaller/config.ini
@@ -54,9 +54,3 @@ WING_DISABLE_EXTDRV=0
 WING_DISABLE_PLUGIN=0
 WING_DISABLE_HEXEXT=0
 WING_DEBUG=0
-
-[$XDG_SESSION_TYPE="wayland"]
-QT_QPA_PLATFORM=xcb
-QT_IM_MODULE=fcitx
-
-
diff --git a/src/dialog/aboutsoftwaredialog.ui b/src/dialog/aboutsoftwaredialog.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>About</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../resources.qrc">
+    <normaloff>:/com.wingsummer.winghex/images/soft.png</normaloff>:/com.wingsummer.winghex/images/soft.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
diff --git a/src/dialog/checksumdialog.cpp b/src/dialog/checksumdialog.cpp
@@ -51,7 +51,8 @@ CheckSumDialog::CheckSumDialog(QWidget *parent) : FramelessDialogBase(parent) {
     layout->addWidget(dbbox);
 
     buildUpContent(widget);
-    this->setWindowTitle(tr("CheckSum"));
+    setWindowTitle(tr("CheckSum"));
+    setWindowIcon(ICONRES("sum"));
 }
 
 const QVector<int> &CheckSumDialog::getResults() { return _result; }
diff --git a/src/dialog/colorpickerdialog.ui b/src/dialog/colorpickerdialog.ui
@@ -6,13 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>262</width>
+    <width>272</width>
     <height>294</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>ColorPicker</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../resources.qrc">
+    <normaloff>:/com.wingsummer.winghex/images/defines.png</normaloff>:/com.wingsummer.winghex/images/defines.png</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QWidget" name="wcolor" native="true">
@@ -33,7 +37,7 @@
    <item>
     <widget class="QLineEdit" name="leColor">
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignmentFlag::AlignCenter</set>
      </property>
     </widget>
    </item>
@@ -71,7 +75,7 @@
             <number>180</number>
            </property>
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
           </widget>
          </item>
@@ -111,7 +115,7 @@
             <number>255</number>
            </property>
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
           </widget>
          </item>
@@ -151,7 +155,7 @@
             <number>255</number>
            </property>
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
           </widget>
          </item>
@@ -178,7 +182,7 @@
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+        <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok|QDialogButtonBox::StandardButton::Reset</set>
        </property>
       </widget>
      </item>
@@ -193,7 +197,9 @@
    <header>control/qcolorpicker_slider.hpp</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>hueSlider</sender>
diff --git a/src/dialog/fileinfodialog.cpp b/src/dialog/fileinfodialog.cpp
@@ -134,6 +134,7 @@ FileInfoDialog::FileInfoDialog(EditorView *editor, QWidget *parent)
     buildUpContent(widget);
 
     setWindowTitle(tr("FileInfo"));
+    setWindowIcon(ICONRES("info"));
     this->resize(500, 450);
 }
 
diff --git a/src/dialog/finddialog.cpp b/src/dialog/finddialog.cpp
@@ -137,7 +137,8 @@ FindDialog::FindDialog(const FindInfo &info, QWidget *parent)
     layout->addWidget(dbbox);
 
     buildUpContent(widget);
-    this->setWindowTitle(tr("find"));
+    setWindowTitle(tr("find"));
+    setWindowIcon(ICONRES("find"));
 
     m_lineeditor->setFocus();
 }
diff --git a/src/dialog/framelessdialogbase.cpp b/src/dialog/framelessdialogbase.cpp
@@ -71,6 +71,9 @@ void FramelessDialogBase::buildUpContent(QWidget *content) {
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(WIN_WIDGET);
 
+    setWindowTitle(content->windowTitle());
+    setWindowIcon(content->windowIcon());
+
 #ifdef QT_DEBUG
     m_isBuilt = true;
 #endif
diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp
@@ -2720,33 +2720,28 @@ void MainWindow::on_metadataedit() {
     if (hexeditor->documentBytes() > 0) {
         MetaDialog m(this);
         auto cur = hexeditor->cursor();
-        if (cur->currentSelectionLength() > 0) {
-            auto mc = doc->metadata()->get(cur->position().offset());
-
-            if (mc.has_value()) {
-                auto meta = mc.value();
-                auto begin = meta.begin;
-                auto end = meta.end;
-                m.setForeGroundColor(meta.foreground);
-                m.setBackGroundColor(meta.background);
-                m.setComment(meta.comment);
-                if (m.exec()) {
-                    auto mi = hexeditor->document()->metadata();
-                    QHexMetadataItem o;
-                    o.begin = begin;
-                    o.end = end;
-                    o.foreground = m.foreGroundColor();
-                    o.background = m.backGroundColor();
-                    o.comment = m.comment();
-                    mi->ModifyMetadata(meta, o);
-                }
-            } else {
-                Toast::toast(this, NAMEICONRES(QStringLiteral("metadata")),
-                             tr("NoMetaData"));
+        auto mc = doc->metadata()->get(cur->position().offset());
+
+        if (mc.has_value()) {
+            auto meta = mc.value();
+            auto begin = meta.begin;
+            auto end = meta.end;
+            m.setForeGroundColor(meta.foreground);
+            m.setBackGroundColor(meta.background);
+            m.setComment(meta.comment);
+            if (m.exec()) {
+                auto mi = hexeditor->document()->metadata();
+                QHexMetadataItem o;
+                o.begin = begin;
+                o.end = end;
+                o.foreground = m.foreGroundColor();
+                o.background = m.backGroundColor();
+                o.comment = m.comment();
+                mi->ModifyMetadata(meta, o);
             }
         } else {
             Toast::toast(this, NAMEICONRES(QStringLiteral("metadata")),
-                         tr("NoSelection"));
+                         tr("NoMetaData"));
         }
     }
 }
diff --git a/src/dialog/metadialog.cpp b/src/dialog/metadialog.cpp
@@ -90,6 +90,7 @@ MetaDialog::MetaDialog(QWidget *parent)
 
     buildUpContent(widget);
     setWindowTitle(tr("Metadata"));
+    setWindowIcon(ICONRES("metadata"));
 }
 
 void MetaDialog::on_accept() {
diff --git a/src/dialog/settingdialog.cpp b/src/dialog/settingdialog.cpp
@@ -71,7 +71,6 @@ SettingDialog::SettingDialog(QWidget *parent)
     _dialog = new FramelessDialogBase(parent);
     _dialog->installEventFilter(this);
     _dialog->buildUpContent(this);
-    _dialog->setWindowTitle(this->windowTitle());
 
     ui->btnRestore->setStyleSheet(
         QStringLiteral("QToolButton::down-arrow {width:10px; height:10px; "
diff --git a/src/dialog/settingdialog.ui b/src/dialog/settingdialog.ui
@@ -19,10 +19,6 @@
   <property name="windowTitle">
    <string>Settings</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/img/general.png</normaloff>:/img/general.png</iconset>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>10</number>
diff --git a/src/dialog/splashdialog.cpp b/src/dialog/splashdialog.cpp
@@ -27,8 +27,7 @@ SplashDialog::SplashDialog(QWidget *parent)
         QStringLiteral("<html><head/><body><p><span style=\" font-size:16pt; "
                        "font-weight:600;\">%1</span></p></body></html>")
             .arg(qAppName()));
-    setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint |
-                   Qt::Window);
+    setWindowFlags(Qt::SplashScreen | Qt::FramelessWindowHint);
     setAttribute(Qt::WA_DeleteOnClose);
     setModal(true);
     show();
diff --git a/src/settings/generalsettingdialog.cpp b/src/settings/generalsettingdialog.cpp
@@ -43,7 +43,8 @@ GeneralSettingDialog::GeneralSettingDialog(QWidget *parent)
     ui->cbWinState->addItems({tr("Normal"), tr("Maximized"), tr("FullScreen")});
 
     ui->lblQtVersion->setText(QString::fromLatin1(QLibraryInfo::build()));
-    ui->lblOS->setText(QSysInfo::prettyProductName());
+    ui->lblOS->setText(QSysInfo::prettyProductName() + QStringLiteral(" - ") +
+                       QApplication::platformName());
     ui->lblSoftVersion->setText(WINGHEX_VERSION);
     ui->lblScriptVersion->setText(ANGELSCRIPT_VERSION_STRING);
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ CheckSumDialog::CheckSumDialog(QWidget *parent) : FramelessDialogBase(parent) {`
`51`	`51`	`layout->addWidget(dbbox);`
`52`	`52`
`53`	`53`	`buildUpContent(widget);`
`54`		`- this->setWindowTitle(tr("CheckSum"));`
	`54`	`+ setWindowTitle(tr("CheckSum"));`
	`55`	`+ setWindowIcon(ICONRES("sum"));`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`const QVector<int> &CheckSumDialog::getResults() { return _result; }`