Skip to content

Commit 2c03959

Browse files
committed
fix: 修复在 wayland 下 dock 无法使用的问题;
1 parent f299b75 commit 2c03959

File tree

4 files changed

+41
-29
lines changed

4 files changed

+41
-29
lines changed

lang/zh_CN/winghex_zh_CN.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -410,72 +410,72 @@
410410
<context>
411411
<name>EditorView</name>
412412
<message>
413-
<location filename="../../src/control/editorview.cpp" line="82"/>
413+
<location filename="../../src/control/editorview.cpp" line="83"/>
414414
<source>Cut</source>
415415
<translation>剪切</translation>
416416
</message>
417417
<message>
418-
<location filename="../../src/control/editorview.cpp" line="84"/>
418+
<location filename="../../src/control/editorview.cpp" line="85"/>
419419
<source>CutHex</source>
420420
<translation>剪切(十六进制)</translation>
421421
</message>
422422
<message>
423-
<location filename="../../src/control/editorview.cpp" line="86"/>
423+
<location filename="../../src/control/editorview.cpp" line="87"/>
424424
<source>Copy</source>
425425
<translation>复制</translation>
426426
</message>
427427
<message>
428-
<location filename="../../src/control/editorview.cpp" line="88"/>
428+
<location filename="../../src/control/editorview.cpp" line="89"/>
429429
<source>CopyHex</source>
430430
<translation>复制(十六进制)</translation>
431431
</message>
432432
<message>
433-
<location filename="../../src/control/editorview.cpp" line="90"/>
433+
<location filename="../../src/control/editorview.cpp" line="91"/>
434434
<source>Paste</source>
435435
<translation>粘贴</translation>
436436
</message>
437437
<message>
438-
<location filename="../../src/control/editorview.cpp" line="92"/>
438+
<location filename="../../src/control/editorview.cpp" line="93"/>
439439
<source>PasteHex</source>
440440
<translation>粘贴(十六进制)</translation>
441441
</message>
442442
<message>
443-
<location filename="../../src/control/editorview.cpp" line="94"/>
443+
<location filename="../../src/control/editorview.cpp" line="95"/>
444444
<source>Delete</source>
445445
<translation>删除</translation>
446446
</message>
447447
<message>
448-
<location filename="../../src/control/editorview.cpp" line="97"/>
448+
<location filename="../../src/control/editorview.cpp" line="98"/>
449449
<source>Find</source>
450450
<translation>查找</translation>
451451
</message>
452452
<message>
453-
<location filename="../../src/control/editorview.cpp" line="99"/>
453+
<location filename="../../src/control/editorview.cpp" line="100"/>
454454
<source>Goto</source>
455455
<translation>跳转</translation>
456456
</message>
457457
<message>
458-
<location filename="../../src/control/editorview.cpp" line="101"/>
458+
<location filename="../../src/control/editorview.cpp" line="102"/>
459459
<source>Fill</source>
460460
<translation>填充</translation>
461461
</message>
462462
<message>
463-
<location filename="../../src/control/editorview.cpp" line="103"/>
463+
<location filename="../../src/control/editorview.cpp" line="104"/>
464464
<source>MetaData</source>
465465
<translation>标注</translation>
466466
</message>
467467
<message>
468-
<location filename="../../src/control/editorview.cpp" line="105"/>
468+
<location filename="../../src/control/editorview.cpp" line="106"/>
469469
<source>BookMark</source>
470470
<translation>书签</translation>
471471
</message>
472472
<message>
473-
<location filename="../../src/control/editorview.cpp" line="294"/>
473+
<location filename="../../src/control/editorview.cpp" line="295"/>
474474
<source>Untitled</source>
475475
<translation>未命名</translation>
476476
</message>
477477
<message>
478-
<location filename="../../src/control/editorview.cpp" line="878"/>
478+
<location filename="../../src/control/editorview.cpp" line="879"/>
479479
<source>Not allowed operation in non-UI thread</source>
480480
<translation>该操作在非 UI 线程非法</translation>
481481
</message>

lang/zh_TW/winghex_zh_TW.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -410,72 +410,72 @@
410410
<context>
411411
<name>EditorView</name>
412412
<message>
413-
<location filename="../../src/control/editorview.cpp" line="82"/>
413+
<location filename="../../src/control/editorview.cpp" line="83"/>
414414
<source>Cut</source>
415415
<translation>剪切</translation>
416416
</message>
417417
<message>
418-
<location filename="../../src/control/editorview.cpp" line="84"/>
418+
<location filename="../../src/control/editorview.cpp" line="85"/>
419419
<source>CutHex</source>
420420
<translation>剪切(十六進制)</translation>
421421
</message>
422422
<message>
423-
<location filename="../../src/control/editorview.cpp" line="86"/>
423+
<location filename="../../src/control/editorview.cpp" line="87"/>
424424
<source>Copy</source>
425425
<translation>複製</translation>
426426
</message>
427427
<message>
428-
<location filename="../../src/control/editorview.cpp" line="88"/>
428+
<location filename="../../src/control/editorview.cpp" line="89"/>
429429
<source>CopyHex</source>
430430
<translation>複製(十六進制)</translation>
431431
</message>
432432
<message>
433-
<location filename="../../src/control/editorview.cpp" line="90"/>
433+
<location filename="../../src/control/editorview.cpp" line="91"/>
434434
<source>Paste</source>
435435
<translation>粘貼</translation>
436436
</message>
437437
<message>
438-
<location filename="../../src/control/editorview.cpp" line="92"/>
438+
<location filename="../../src/control/editorview.cpp" line="93"/>
439439
<source>PasteHex</source>
440440
<translation>粘貼(十六進制)</translation>
441441
</message>
442442
<message>
443-
<location filename="../../src/control/editorview.cpp" line="94"/>
443+
<location filename="../../src/control/editorview.cpp" line="95"/>
444444
<source>Delete</source>
445445
<translation>刪除</translation>
446446
</message>
447447
<message>
448-
<location filename="../../src/control/editorview.cpp" line="97"/>
448+
<location filename="../../src/control/editorview.cpp" line="98"/>
449449
<source>Find</source>
450450
<translation>查找</translation>
451451
</message>
452452
<message>
453-
<location filename="../../src/control/editorview.cpp" line="99"/>
453+
<location filename="../../src/control/editorview.cpp" line="100"/>
454454
<source>Goto</source>
455455
<translation>跳轉</translation>
456456
</message>
457457
<message>
458-
<location filename="../../src/control/editorview.cpp" line="101"/>
458+
<location filename="../../src/control/editorview.cpp" line="102"/>
459459
<source>Fill</source>
460460
<translation>填充</translation>
461461
</message>
462462
<message>
463-
<location filename="../../src/control/editorview.cpp" line="103"/>
463+
<location filename="../../src/control/editorview.cpp" line="104"/>
464464
<source>MetaData</source>
465465
<translation>標注</translation>
466466
</message>
467467
<message>
468-
<location filename="../../src/control/editorview.cpp" line="105"/>
468+
<location filename="../../src/control/editorview.cpp" line="106"/>
469469
<source>BookMark</source>
470470
<translation>書簽</translation>
471471
</message>
472472
<message>
473-
<location filename="../../src/control/editorview.cpp" line="294"/>
473+
<location filename="../../src/control/editorview.cpp" line="295"/>
474474
<source>Untitled</source>
475475
<translation>未命名</translation>
476476
</message>
477477
<message>
478-
<location filename="../../src/control/editorview.cpp" line="878"/>
478+
<location filename="../../src/control/editorview.cpp" line="879"/>
479479
<source>Not allowed operation in non-UI thread</source>
480480
<translation>該操作在非 UI 線程非法</translation>
481481
</message>

main.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ int main(int argc, char *argv[]) {
2020

2121
QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
2222

23+
#ifdef Q_OS_LINUX
24+
// fix wayland issue (a workaround): floating dock not work
25+
// reference:
26+
// https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/
27+
// issues/714#issuecomment-2802752677
28+
if (qgetenv("XDG_SESSION_TYPE")
29+
.compare(QByteArrayLiteral("wayland"), Qt::CaseInsensitive) == 0) {
30+
qputenv("QT_QPA_PLATFORM", "xcb");
31+
}
32+
#endif
33+
2334
QApplication::setApplicationName(APP_NAME);
2435
QApplication::setOrganizationName(APP_ORG);
2536
QApplication::setApplicationVersion(WINGHEX_VERSION);

src/control/editorview.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ EditorView::EditorView(QWidget *parent)
6363
auto hexLayout = new QVBoxLayout(m_hexContainer);
6464
hexLayout->setSpacing(0);
6565
hexLayout->setContentsMargins(0, 0, 0, 0);
66-
m_hex = new QHexView;
66+
m_hex = new QHexView(this);
67+
m_hex->setScaleRate(1);
6768
hexLayout->addWidget(m_hex, 1);
6869
m_goto = new GotoWidget(this);
6970
connect(m_goto, &GotoWidget::jumpToLine, this,

0 commit comments

Comments
 (0)