Skip to content

fix: remove redundant title label in dialog #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
May 22, 2026
Merged

fix: remove redundant title label in dialog #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/dcc-update-plugin/qml/UpdateHistoryDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2025 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15
import QtQuick.Layouts 1.15
Expand All @@ -22,14 +22,6 @@ D.DialogWindow {
width: root.width// - DS.Style.dialogWindow.contentHMargin * 2
spacing: 0

D.Label {
Layout.alignment: Qt.AlignHCenter
Layout.bottomMargin: 12
text: title
font: D.DTK.fontManager.t6
color: D.DTK.themeType == D.ApplicationHelper.LightType ? Qt.rgba(0, 0, 0, 1) : Qt.rgba(1, 1, 1, 1)
wrapMode: Text.WordWrap
}

// 无更新历史时的提示
Control {
Expand Down
15 changes: 3 additions & 12 deletions src/dcc-update-plugin/qml/UpdateLogDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import org.deepin.dcc 1.0
D.DialogWindow {
id: root
width: 480
height: 380
icon: "preferences-system"
modality: Qt.WindowModal
title: qsTr("Update Log")
Expand All @@ -20,22 +19,13 @@ D.DialogWindow {
signal exportBtnClicked()

ColumnLayout {
anchors.fill: parent
width: root.width - root.leftPadding - root.rightPadding
spacing: 10

D.Label {
id: titleLabel
Layout.alignment: Qt.AlignHCenter
text: title
font: D.DTK.fontManager.t6
color: D.DTK.themeType === D.ApplicationHelper.LightType ? Qt.rgba(0, 0, 0, 1) : Qt.rgba(1, 1, 1, 1)
wrapMode: Text.WordWrap
}

ScrollView {
id: scrollView
Layout.fillWidth: true
Layout.preferredHeight: root.height - titleLabel.height - buttonRow.height - 80
Layout.preferredHeight: 340 - DS.Style.dialogWindow.titleBarHeight - buttonRow.implicitHeight - DS.Style.dialogWindow.contentVMargin
clip: true

background: Rectangle {
Expand Down Expand Up @@ -65,6 +55,7 @@ D.DialogWindow {
// 按钮行
RowLayout {
id: buttonRow
Layout.bottomMargin: DS.Style.dialogWindow.contentHMargin
spacing: 10

Button {
Expand Down
Loading