From 7afa5a1117627d47b1e51000c61cc481cf4b7c0d Mon Sep 17 00:00:00 2001 From: xiepengfei Date: Thu, 2 Jan 2025 17:33:27 +0800 Subject: [PATCH] fix: Fixed the display issue Fixed the display issue Bug: https://pms.uniontech.com/bug-view-277249.html, https://pms.uniontech.com/bug-view-277813.html Log: Fixed the display issue --- src/common/utils.cpp | 4 +- src/dsg/icons/recording_pause.dci | Bin 5802 -> 6828 bytes src/dsg/icons/recording_start.dci | Bin 6846 -> 7240 bytes src/dsg/icons/recording_stop.dci | Bin 5364 -> 5070 bytes src/gui/mainwindow/FolderListView.qml | 4 +- src/gui/mainwindow/ItemListView.qml | 3 +- src/gui/mainwindow/RecordingView.qml | 55 ++++++++++++++++++++------ src/gui/mainwindow/WebEngineView.qml | 10 ++--- src/web/css/bootstrapCssReset.css | 30 +++++++++++++- src/web/css/dark.css | 4 ++ src/web/index.js | 8 ++-- src/web/js/summernote_v9_2.js | 4 +- 12 files changed, 93 insertions(+), 29 deletions(-) diff --git a/src/common/utils.cpp b/src/common/utils.cpp index a1e46c3e..faace095 100644 --- a/src/common/utils.cpp +++ b/src/common/utils.cpp @@ -186,10 +186,10 @@ QString Utils::formatMillisecond(qint64 millisecond, qint64 minValue) curSecond = minValue; } if (curSecond < 3600) { - return QDateTime::fromSecsSinceEpoch(static_cast(curSecond)).toUTC().toString("mm:ss"); + return QDateTime::fromSecsSinceEpoch(static_cast(curSecond)).toUTC().toString("hh:mm:ss"); } - return QString("60:00"); + return QString("60:00:00"); } /** diff --git a/src/dsg/icons/recording_pause.dci b/src/dsg/icons/recording_pause.dci index e5bb2e00149fa5f1f99f2a135b1b028b440cf178..5147d9a9ed43e0b6e6f0d8d9a84880b5eaf792bc 100644 GIT binary patch literal 6828 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 diff --git a/src/dsg/icons/recording_stop.dci b/src/dsg/icons/recording_stop.dci index 900f225c6988a1ac3500024ed9ab0b8f501ed7da..7ae4ab0da06efc895763978d3dd6a59704bebb2b 100644 GIT binary patch literal 5070 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 D*y$41 literal 5364 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 diff --git a/src/gui/mainwindow/FolderListView.qml b/src/gui/mainwindow/FolderListView.qml index efda52aa..2535661b 100644 --- a/src/gui/mainwindow/FolderListView.qml +++ b/src/gui/mainwindow/FolderListView.qml @@ -394,10 +394,12 @@ Item { folderListView.itemAtIndex(folderListView.currentIndex).isRename = true; } onEntered: { - tooltipVisible = true; + if (folderNameLabel.implicitWidth > folderNameLabel.width) + tooltipVisible = true; if (folderListView.currentIndex == index) { return; } + parent.isHovered = true; } onExited: { diff --git a/src/gui/mainwindow/ItemListView.qml b/src/gui/mainwindow/ItemListView.qml index c23e2a55..95c7d7e6 100644 --- a/src/gui/mainwindow/ItemListView.qml +++ b/src/gui/mainwindow/ItemListView.qml @@ -605,7 +605,8 @@ Item { itemListView.itemAtIndex(index).isRename = true; } onEntered: { - rootItemDelegate.hovered = true; + if (noteNameLabel.implicitWidth > noteNameLabel.width) + rootItemDelegate.hovered = true; } onExited: { rootItemDelegate.hovered = false; diff --git a/src/gui/mainwindow/RecordingView.qml b/src/gui/mainwindow/RecordingView.qml index 5fca0e33..541e57f9 100644 --- a/src/gui/mainwindow/RecordingView.qml +++ b/src/gui/mainwindow/RecordingView.qml @@ -7,9 +7,10 @@ import VNote 1.0 Item { id: rootItem - property int iconSize: 24 + property int btnSize: 30 + property int iconSize: 72 property bool isRecording: true - property string time: "00:00" + property string time: "00:00:00" signal pauseRecording signal stopRecording @@ -18,11 +19,10 @@ Item { curves.stopRecording(); stopRecording(); rootItem.visible = false; - time = "00:00"; + time = "00:00:00"; } - implicitHeight: 42 - implicitWidth: 364 + implicitHeight: 70 visible: false onVisibleChanged: { @@ -30,26 +30,54 @@ Item { } Rectangle { + id: backRectangle + anchors.fill: parent + + gradient: Gradient { + GradientStop { + color: DTK.themeType === ApplicationHelper.LightType ? "#19FFFFFF" : "#19242424" + position: 0.0 + } + + GradientStop { + color: DTK.themeType === ApplicationHelper.LightType ? "white" : "#242424" + position: 0.3 + } + } + } + + Rectangle { + id: back + + anchors.bottom: backRectangle.bottom + anchors.bottomMargin: 10 + anchors.horizontalCenter: parent.horizontalCenter border.color: DTK.themeType === ApplicationHelper.LightType ? "#0A000000" : "#19FFFFFF" border.width: 1 color: DTK.themeType === ApplicationHelper.LightType ? "#7FF4F4F4" : "#0A0A10" + implicitHeight: 42 + implicitWidth: 364 radius: 12 } RowLayout { - anchors.fill: parent - spacing: 0 + anchors.centerIn: back + implicitHeight: 42 + implicitWidth: 364 + spacing: 10 ToolButton { id: pauseBtn - height: rootItem.height icon.height: iconSize icon.name: isRecording ? "recording_pause" : "recording_start" icon.width: iconSize - spacing: 0 - width: rootItem.height + implicitHeight: btnSize + implicitWidth: btnSize + + background: Item { + } onClicked: { pauseRecording(); @@ -74,11 +102,14 @@ Item { ToolButton { id: stopBtn - height: rootItem.height icon.height: iconSize icon.name: "recording_stop" icon.width: iconSize - width: rootItem.height + implicitHeight: btnSize + implicitWidth: btnSize + + background: Item { + } onClicked: { stop(); diff --git a/src/gui/mainwindow/WebEngineView.qml b/src/gui/mainwindow/WebEngineView.qml index b35304f2..bcf314c2 100644 --- a/src/gui/mainwindow/WebEngineView.qml +++ b/src/gui/mainwindow/WebEngineView.qml @@ -95,11 +95,12 @@ Item { color: webView.backgroundColor visible: noSearchResult - IconLabel { + DciIcon { id: noSearchIcon anchors.centerIn: noSearchRect - icon.name: "search_no_results" + name: "search_no_results" + theme: DTK.themeType visible: noSearchResult } } @@ -344,11 +345,10 @@ Item { active: false anchors.bottom: rootItem.bottom - anchors.bottomMargin: 10 anchors.horizontalCenter: rootItem.horizontalCenter asynchronous: true - height: 42 - width: 364 + height: 70 + width: rootItem.width sourceComponent: RecordingView { id: recordingBar diff --git a/src/web/css/bootstrapCssReset.css b/src/web/css/bootstrapCssReset.css index 768e7f70..7aee2883 100644 --- a/src/web/css/bootstrapCssReset.css +++ b/src/web/css/bootstrapCssReset.css @@ -115,7 +115,7 @@ p { border: 1px solid rgba(255, 255, 255, 0.1); border-radius: 12px; box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.20); - top: 135%; + top: 115%; left: -12px; } @@ -138,6 +138,26 @@ p { outline: none; } +.note-color-back .note-color-palette .note-color-btn { + position: relative; +} + +.note-color-back .note-color-palette .note-color-btn::before { + content: ''; + position: absolute; + top: 50%; + left: 50%; + width: 110%; + height: 1px; + background-color: transparent; + transform: translate(-50%, -50%) rotate(135deg); + pointer-events: none; /* 确保斜线不会影响按钮的点击事件 */ +} + +.note-color-back .note-color-palette .note-color-row:first-child .note-color-btn:first-child::before { + background-color: #00000040; +} + .colorFont { color: rgba(65, 77, 104, 1); margin: 3px; @@ -241,6 +261,7 @@ ul { .note-editable { padding: 20px 20px 0 30px; + padding-bottom: 50px; } .note-editable img { @@ -299,6 +320,11 @@ ul { color: inherit; } +.note-air-popover { + max-width: 100% !important; + margin: 0 auto !important; +} + .dropdown-fontsize>li>a:hover, .dropdown-fontname>li>a:hover { background-color: rgba(0, 0, 0, 0.05); @@ -399,4 +425,4 @@ ul { border-bottom-left-radius: 6px; } -/***** 字体名称/大小按钮 End *****/ \ No newline at end of file +/***** 字体名称/大小按钮 End *****/ diff --git a/src/web/css/dark.css b/src/web/css/dark.css index ff65c3ff..7c421f19 100644 --- a/src/web/css/dark.css +++ b/src/web/css/dark.css @@ -89,6 +89,10 @@ strike[style="text-decoration-line: underline;"] { border-color: rgba(255, 255, 255, 0.2); } +.note-color-back .note-color-palette .note-color-row:first-child .note-color-btn:first-child::before { + background-color: rgba(255, 255, 255, 0.2);; +} + .planButton button { background: rgba(255, 255, 255, 0.10); } diff --git a/src/web/index.js b/src/web/index.js index 515e4c0a..63b78a42 100644 --- a/src/web/index.js +++ b/src/web/index.js @@ -148,7 +148,7 @@ var isUlOrOl = false const airPopoverHeight = 44 //悬浮工具栏高度 const airPopoverWidth = 385 //悬浮工具栏宽度 const airPopoverLeftMargin = 20 //悬浮工具栏距离编辑区左侧边距 -const airPopoverRightMargin = 15 //悬浮工具栏距离编辑区右侧边距 +const airPopoverRightMargin = 35 //悬浮工具栏距离编辑区右侧边距 // 翻译列表 var tooltipContent = { @@ -1656,7 +1656,7 @@ $('body').on('click', '.dropdown-toggle', function (e) { if (menuItem && menuItem.classList.contains('dropdown-menu')) { if (needClose) { // reset css config - menuItem.style.top = '135%'; + menuItem.style.top = '115%'; return; } // temporarily set display to block to get the height of the menu @@ -1677,9 +1677,9 @@ $('body').on('click', '.dropdown-toggle', function (e) { menuItem.classList.remove('show'); if (showTop) { - menuItem.style.top = '-' + (menuRect.height + 20) + 'px'; + menuItem.style.top = '-' + (menuRect.height + 10) + 'px'; } else { - menuItem.style.top = '135%'; + menuItem.style.top = '115%'; } } }) diff --git a/src/web/js/summernote_v9_2.js b/src/web/js/summernote_v9_2.js index a1fbd890..e81a3b37 100644 --- a/src/web/js/summernote_v9_2.js +++ b/src/web/js/summernote_v9_2.js @@ -7262,8 +7262,8 @@ // 更新当前选中色 var selectColor = $('.note-forecolor .selectColor').css('background-color') $('.icon-forecolor .path1').css('color', selectColor) - - var curBackColors = isDarkTheme ? this.options.simpleDarkBackColors + + var curBackColors = isDarkTheme ? this.options.simpleDarkBackColors : this.options.simpleLightBackColors; if (0 == curBackColors.length) { console.warn("Not found background color palette!");