tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove CommonFont singleton.

This commit is contained in:
Black Hat 2019-04-30 17:12:16 +08:00
parent 75eb4c5b52
commit 760d1cfb9c
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imports/Spectral/Component/Timeline/MessageDelegate.qml
View File

@ -10,7 +10,6 @@ import Spectral.Component 2.0
import Spectral.Dialog 2.0
import Spectral.Menu.Timeline 2.0
import Spectral.Effect 2.0
import Spectral.Font 0.1
ColumnLayout {
readonly property bool avatarVisible: !sentByMe && (aboveAuthor !== author || aboveSection !== section || aboveEventType === "state" || aboveEventType === "emote" || aboveEventType === "other")
@ -202,7 +201,7 @@ ColumnLayout {
color: "white"
font.family: CommonFont.font.family
font.family: window.font.family
font.pixelSize: 14
selectByMouse: true
readOnly: true

5
imports/Spectral/Font/CommonFont.qml
View File

@ -1,5 +0,0 @@
pragma Singleton
import QtQuick 2.12
import QtQuick.Controls 2.12
Label {}

1
imports/Spectral/Font/qmldir
View File

@ -1,3 +1,2 @@
module Spectral.Font
singleton MaterialFont 0.1 MaterialFont.qml
singleton CommonFont 0.1 CommonFont.qml

1
res.qrc
View File

@ -30,7 +30,6 @@
<file>imports/Spectral/Component/AutoListView.qml</file>
<file>imports/Spectral/Component/AutoTextField.qml</file>
<file>imports/Spectral/Panel/RoomPanelInput.qml</file>
<file>imports/Spectral/Font/CommonFont.qml</file>
<file>imports/Spectral/Component/Timeline/SectionDelegate.qml</file>
<file>assets/img/matrix.svg</file>
<file>imports/Spectral/Effect/RippleEffect.qml</file>