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
linuxdeepin · Jan 2, 2025 · 7afa5a1 · 7afa5a1
1 parent 9345920
commit 7afa5a1
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 29 deletions.
diff --git 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<qint64>(curSecond)).toUTC().toString("mm:ss");
+        return QDateTime::fromSecsSinceEpoch(static_cast<qint64>(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
diff --git a/src/dsg/icons/recording_start.dci b/src/dsg/icons/recording_start.dci
diff --git a/src/dsg/icons/recording_stop.dci b/src/dsg/icons/recording_stop.dci
diff --git 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
@@ -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
@@ -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,38 +19,65 @@ Item {
         curves.stopRecording();
         stopRecording();
         rootItem.visible = false;
-        time = "00:00";
+        time = "00:00:00";
     }
 
-    implicitHeight: 42
-    implicitWidth: 364
+    implicitHeight: 70
     visible: false
 
     onVisibleChanged: {
         curves.startRecording();
     }
 
     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
@@ -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
@@ -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 *****/
+/***** 字体名称/大小按钮 End *****/
diff --git 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
@@ -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
@@ -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!");