Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 4 deletions friture/Levels.qml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Rectangle {
color: systemPalette.window

property var stateId
property LevelViewModel level_view_model: Store.dock_states[stateId]
property LevelViewModel level_view_model: Store.dock_states[stateId]

property var fixedFont

// parent here will be unset on exit
height: parent ? parent.height : 0
Expand All @@ -24,7 +26,7 @@ Rectangle {
id: fontMetrics
font.pointSize: 14
font.bold: true
font.family: "monospace"
font.family: fixedFont
}

ColumnLayout {
Expand All @@ -39,7 +41,7 @@ Rectangle {
text: level_view_model.two_channels ? "1: " + level_to_text(level_view_model.level_data_slow.level_max) + "<br />2: " + level_to_text(level_view_model.level_data_slow_2.level_max) : level_to_text(level_view_model.level_data_slow.level_max)
font.pointSize: 14
font.bold: true
font.family: "monospace"
font.family: fixedFont
verticalAlignment: Text.AlignBottom
horizontalAlignment: Text.AlignRight
Layout.alignment: Qt.AlignBottom | Qt.AlignRight
Expand All @@ -62,7 +64,7 @@ Rectangle {
text: level_view_model.two_channels ? "1: " + level_to_text(level_view_model.level_data_slow.level_rms) + "<br />2: " + level_to_text(level_view_model.level_data_slow_2.level_rms) : level_to_text(level_view_model.level_data_slow.level_rms)
font.pointSize: 14
font.bold: true
font.family: "monospace"
font.family: fixedFont
verticalAlignment: Text.AlignBottom
horizontalAlignment: Text.AlignRight
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
Expand Down
5 changes: 4 additions & 1 deletion friture/levels.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from PyQt5 import QtWidgets
from PyQt5.QtQml import QQmlComponent
from PyQt5.QtQuick import QQuickWindow # type: ignore
from PyQt5.QtGui import QFontDatabase
import numpy as np

from friture.store import GetStore
Expand Down Expand Up @@ -56,8 +57,10 @@ def __init__(self, parent, engine):
component = QQmlComponent(engine, qml_url("Levels.qml"), self)
raise_if_error(component)

fixedFont = QFontDatabase.systemFont(QFontDatabase.FixedFont)

engineContext = engine.rootContext()
initialProperties = {"parent": self.quickWindow.contentItem(), "stateId": state_id }
initialProperties = {"parent": self.quickWindow.contentItem(), "stateId": state_id, "fixedFont": fixedFont }
self.qmlObject = component.createWithInitialProperties(initialProperties, engineContext)
self.qmlObject.setParent(self.quickWindow)

Expand Down