more unfinished changes, process tab for dashboard
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include "font.hpp"
|
||||
|
||||
#include "appearance.hpp"
|
||||
#include "config.hpp"
|
||||
#include "rootnodes.hpp"
|
||||
|
||||
namespace ZShell::config {
|
||||
|
||||
@@ -59,20 +59,20 @@ void FontStyleBase::bind(FontStyleNode* cfg) {
|
||||
|
||||
if (cfg) {
|
||||
connect(
|
||||
cfg, &ConfigNode::propertiesChanged, this, &FontStyleBase::rebuild);
|
||||
cfg, &settings::Node::optionChanged, this, &FontStyleBase::rebuild);
|
||||
connect(
|
||||
cfg->largeNode(),
|
||||
&ConfigNode::propertiesChanged,
|
||||
&settings::Node::optionChanged,
|
||||
this,
|
||||
&FontStyleBase::rebuild);
|
||||
connect(
|
||||
cfg->mediumNode(),
|
||||
&ConfigNode::propertiesChanged,
|
||||
&settings::Node::optionChanged,
|
||||
this,
|
||||
&FontStyleBase::rebuild);
|
||||
connect(
|
||||
cfg->smallNode(),
|
||||
&ConfigNode::propertiesChanged,
|
||||
&settings::Node::optionChanged,
|
||||
this,
|
||||
&FontStyleBase::rebuild);
|
||||
}
|
||||
@@ -128,7 +128,7 @@ void IconFontStyle::bind(FontStyleNode* cfg) {
|
||||
if (cfg)
|
||||
connect(
|
||||
cfg->extraLargeNode(),
|
||||
&ConfigNode::propertiesChanged,
|
||||
&settings::Node::optionChanged,
|
||||
this,
|
||||
&IconFontStyle::rebuild);
|
||||
}
|
||||
@@ -181,16 +181,14 @@ FontBuilder IconFontBuilders::extraLarge() const {
|
||||
}
|
||||
|
||||
FontTokens::FontTokens(QObject* parent)
|
||||
: ConfigObject(parent)
|
||||
, m_size(new FontSizeTokens(this))
|
||||
: QObject(parent)
|
||||
, m_headline(new FontStyle(this))
|
||||
, m_title(new FontStyle(this))
|
||||
, m_body(new FontStyle(this))
|
||||
, m_label(new FontStyle(this))
|
||||
, m_mono(new FontStyle(this))
|
||||
, m_icon(new IconFontStyle(this)) {
|
||||
if (!Config::instance()) new Config();
|
||||
bindFont(Config::instance()->appearance()->font());
|
||||
bindFont(ConfigSingleton::instance()->appearance()->font());
|
||||
}
|
||||
|
||||
FontStyle* FontTokens::headline() const {
|
||||
|
||||
Reference in New Issue
Block a user