Skip to content

Commit

Permalink
refactor: Remove PixelMetric.js
Browse files Browse the repository at this point in the history 
  It has been replaced with `FlowStyle`.
  • Loading branch information
@18202781743
18202781743 committed Jul 7, 2023
1 parent a691256 commit 8d2a959
Show file tree
Hide file tree
Showing 22 changed files with 69 additions and 301 deletions.
3 changes: 0 additions & 3 deletions chameleon/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ set(QML_FILES
TextField.qml
ToolTip.qml
)
set(JS_FILES PixelMetric.js)
set(SRC_FILES
qtquickcontrols2chameleonstyleplugin.h qtquickcontrols2chameleonstyleplugin.cpp
)

if(EnableQt5)
file(GLOB _qml_files ${QML_FILES})
file(GLOB _js_files ${JS_FILES})
set(TARGETPATH "QtQuick/Controls.2/Chameleon")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/plugins/Chameleon")
set(PLUGIN_INSTALL_DIR "${QML_INSTALL_DIR}/${TARGETPATH}")
Expand Down Expand Up @@ -93,7 +91,6 @@ if(EnableQt5)
install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES
${QML_DIR}
${_js_files}
${_qml_files}
${QMLC_FILES}
DESTINATION ${PLUGIN_INSTALL_DIR}
Expand Down
123 changes: 0 additions & 123 deletions chameleon/PixelMetric.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion chameleon/qml.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@
<file>TextArea.qml</file>
<file>TextField.qml</file>
<file>ToolTip.qml</file>
<file>PixelMetric.js</file>
</qresource>
</RCC>
5 changes: 0 additions & 5 deletions qt6/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ qt_add_translation(QM_FILES ${TS_FILES})

include(qml.cmake)

set_source_files_properties(${PROJECT_SOURCE_DIR}/chameleon/PixelMetric.js
PROPERTIES QT_RESOURCE_ALIAS "PixelMetric.js"
)

qt_add_qml_module(${LIB_NAME}
PLUGIN_TARGET ${LIB_NAME}plugin
URI "org.deepin.dtk"
Expand All @@ -47,7 +43,6 @@ qt_add_qml_module(${LIB_NAME}
NO_PLUGIN_OPTIONAL
QML_FILES
${QML_DTK_CONTROLS}
${PROJECT_SOURCE_DIR}/chameleon/PixelMetric.js
SOURCES
${SRCS} ${HEADERS}
dquickextendregister_p.h
Expand Down
1 change: 0 additions & 1 deletion qt6/src/dtkdeclarative_qml.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<file>qml/ToolButton.qml</file>
<file>qml/WarningButton.qml</file>
<file>qml/FocusBoxBorder.qml</file>
<file alias="qml/PixelMetric.js">../../chameleon/PixelMetric.js</file>
<file>qml/CicleSpreadAnimation.qml</file>
<file>qml/TitleBar.qml</file>
<file>qml/DialogTitleBar.qml</file>
Expand Down
14 changes: 7 additions & 7 deletions qt6/src/qml/DelayButton.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import QtQuick 2.11
import QtQuick.Controls.impl 2.4
import QtQuick.Templates as T
import "PixelMetric.js" as PM
import org.deepin.dtk.style 1.0 as DS

T.DelayButton {
id: control
Expand All @@ -16,8 +16,8 @@ T.DelayButton {
Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)

padding: PM.ControlPadding
spacing: PM.ControlSpacing
padding: DS.Style.control.padding
spacing: DS.Style.control.spacing

transition: Transition {
NumberAnimation {
Expand Down Expand Up @@ -56,9 +56,9 @@ T.DelayButton {
}

background: Rectangle {
implicitWidth: control.text.length ? PM.Button_MiniSize + (4 * PM.ControlRadius) : PM.Button_MiniSize + (2 * PM.ControlRadius)
implicitHeight: PM.Button_MiniSize
radius: PM.ControlRadius
implicitWidth: control.text.length ? DS.Style.control.button.height + (4 * DS.Style.control.radius) : DS.Style.control.button.height + (2 * DS.Style.control.radius)
implicitHeight: DS.Style.control.button.height
radius: DS.Style.control.radius
color: control.palette.button

FocusBoxBorder {
Expand All @@ -76,7 +76,7 @@ T.DelayButton {
Rectangle {
width: parent.parent.width
height: parent.parent.height
radius: PM.ControlRadius
radius: DS.Style.control.radius
color: control.palette.highlight
}
}
Expand Down
12 changes: 6 additions & 6 deletions qt6/src/qml/Dial.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import QtQuick 2.11
import QtQuick.Controls.Basic.impl
import QtQuick.Templates as T
import "PixelMetric.js" as PM
import org.deepin.dtk.style 1.0 as DS

T.Dial {
id: control
Expand All @@ -16,19 +16,19 @@ T.Dial {
contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0)

background: DialImpl {
implicitWidth: PM.Dial_miniSize
implicitHeight: PM.Dial_miniSize
implicitWidth: DS.Style.dial.size
implicitHeight: DS.Style.dial.size
color: control.palette.highlight
progress: control.position
}

handle: Rectangle {
id: handleItem
anchors.centerIn: control.background
width: 2 * PM.ControlRadius
height: 2 * PM.ControlRadius
width: 2 * DS.Style.control.radius
height: 2 * DS.Style.control.radius
color: control.palette.highlight
radius: PM.ControlRadius
radius: DS.Style.control.radius
antialiasing: true
transform: [
Translate {
Expand Down
8 changes: 4 additions & 4 deletions qt6/src/qml/DialogButtonBox.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import QtQuick 2.11
import QtQuick.Templates as T
import "PixelMetric.js" as PM
import org.deepin.dtk.style 1.0 as DS

T.DialogButtonBox {
id: control
Expand All @@ -14,15 +14,15 @@ T.DialogButtonBox {
implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding)

padding: PM.ControlPadding
spacing: PM.ControlSpacing
padding: DS.Style.control.padding
spacing: DS.Style.control.spacing
alignment: Qt.AlignRight

delegate: Button { }

contentItem: ListView {
implicitWidth: contentWidth
implicitHeight: PM.Button_MiniSize
implicitHeight: DS.Style.control.button.height

model: control.contentModel
spacing: control.spacing
Expand Down
13 changes: 12 additions & 1 deletion qt6/src/qml/FlowStyle.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import QtQuick 2.0
import org.deepin.dtk 1.0 as D

QtObject {
// PixelMetric
property QtObject control: QtObject {
property int radius: 8
property int spacing: 6
property int padding: 6
property int margin: 6
property int borderWidth: 1
property real focusBorderWidth: 2
property real focusBorderPaddings: 1
Expand Down Expand Up @@ -867,4 +867,15 @@ QtObject {
}
}
}

// Dial
property QtObject dial: QtObject {
property int size: 100
}

// PageIndicator
property QtObject pageIndicator: QtObject {
property int width: 8
property int height: 8
}
}
6 changes: 3 additions & 3 deletions qt6/src/qml/Frame.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import QtQuick 2.11
import QtQuick.Templates as T
import "PixelMetric.js" as PM
import org.deepin.dtk.style 1.0 as DS

T.Frame {
id: control
Expand All @@ -15,8 +15,8 @@ T.Frame {
contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)

padding: PM.ControlPadding
property int radius: PM.ControlRadius
padding: DS.Style.control.padding
property int radius: DS.Style.control.radius

background: Rectangle {
color: "transparent"
Expand Down
6 changes: 3 additions & 3 deletions qt6/src/qml/GroupBox.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import QtQuick 2.11
import QtQuick.Templates as T
import "PixelMetric.js" as PM
import org.deepin.dtk.style 1.0 as DS

T.GroupBox {
id: control
Expand All @@ -21,7 +21,7 @@ T.GroupBox {
topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0)

label: Label {
x: PM.ControlRadius
x: DS.Style.control.radius
text: control.title
color: control.palette.windowText
elide: Text.ElideRight
Expand All @@ -33,7 +33,7 @@ T.GroupBox {
background: Rectangle {
y: label.height / 2
width: parent.width
radius: PM.ControlRadius
radius: DS.Style.control.radius

color: control.palette.window
}
Expand Down
6 changes: 3 additions & 3 deletions qt6/src/qml/PageIndicator.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import QtQuick 2.11
import QtQuick.Templates as T
import "PixelMetric.js" as PM
import org.deepin.dtk.style 1.0 as DS

T.PageIndicator {
id: control
Expand All @@ -14,8 +14,8 @@ T.PageIndicator {
implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding)

padding: PM.ControlPadding
spacing: PM.ControlPadding
padding: DS.Style.control.padding
spacing: DS.Style.control.padding

delegate: Rectangle {
implicitWidth: PM.PageIndicator_ImplicitWidth
Expand Down
Loading

0 comments on commit 8d2a959

Please sign in to comment.