diff --git a/notes b/notes index be1356d..123e1dd 100644 --- a/notes +++ b/notes @@ -75,8 +75,10 @@ TODO { maybe interpolate between resampler LUT levels bugs to fix { - connecting a CapaXitor up for the first time during playback deadlocks audio engine - PLAYBACK BREAKS AFTER FIRST PLAY??? { + - font fuckiness with additional windows + + x connecting a CapaXitor up for the first time during playback deadlocks audio engine + x PLAYBACK BREAKS AFTER FIRST PLAY??? { doesn't happen in Lovely Storm; only where Capaxitor is used?? resolves itself after project switch does NOT break preview mode?? diff --git a/xybrid/mainwindow.cpp b/xybrid/mainwindow.cpp index b9ac71a..476f62d 100644 --- a/xybrid/mainwindow.cpp +++ b/xybrid/mainwindow.cpp @@ -468,6 +468,9 @@ MainWindow::MainWindow(QWidget *parent, const QString& fileName) : emit ui->spinSampleNoteSub->valueChanged(0.0); // force refresh } + // force fonts to display properly + updateFont(); + // Set up signaling from project to UI socket->setParent(this); socket->window = this; @@ -800,6 +803,19 @@ void MainWindow::updateTitle() { setWindowTitle(qs("Xybrid - ") % songTitle); } +void MainWindow::updateFont() { + QString font = qs("Iosevka Term Light"); + double pt = 10.0; + + QString fstr = qs("font: %2pt \"%1\";").arg(font).arg(pt); + QString tfstr = qs("QTableView { %1 }").arg(fstr); + QString hfstr = qs("QHeaderView { %1 }").arg(fstr); + + ui->patternSequencer->setStyleSheet(tfstr); + ui->patternEditor->setStyleSheet(tfstr); + ui->patternEditor->verticalHeader()->setStyleSheet(hfstr); +} + void MainWindow::setSongInfoPaneExpanded(bool open) { if (open) { ui->songInfoPane->setCurrentIndex(1); diff --git a/xybrid/mainwindow.h b/xybrid/mainwindow.h index 9fe10e1..0d3a353 100644 --- a/xybrid/mainwindow.h +++ b/xybrid/mainwindow.h @@ -53,6 +53,7 @@ namespace Xybrid { void openPatternProperties(const std::shared_ptr&); void updateTitle(); + void updateFont(); void setSongInfoPaneExpanded(bool); void setFloater(QWidget* = nullptr); diff --git a/xybrid/mainwindow.ui b/xybrid/mainwindow.ui index 0a30adf..441cd7d 100644 --- a/xybrid/mainwindow.ui +++ b/xybrid/mainwindow.ui @@ -453,6 +453,8 @@ Iosevka Term Light 10 + false + false @@ -505,6 +507,8 @@ Iosevka Term Light 10 + false + false diff --git a/xybrid/ui/patterneditormodel.cpp b/xybrid/ui/patterneditormodel.cpp index 4d5422a..9c489f2 100644 --- a/xybrid/ui/patterneditormodel.cpp +++ b/xybrid/ui/patterneditormodel.cpp @@ -112,13 +112,13 @@ QVariant PatternEditorModel::data(const QModelIndex &index, int role) const { if (cc % 2 == 0) { if (row.numParams() > cp) return QString(1,static_cast(row.params->at(cp)[0])); if (row.numParams() == cp) return qs("ยป "); - return qs(""); + return QString(); } if (row.numParams() > cp) { if (row.params->at(cp)[0] == ' ') return qs("- "); return byteStr(row.params->at(cp)[1]); } - return qs(""); + return QString(); } } else if (role == Qt::SizeHintRole) { if (index.row() >= pattern->rows) return QSize(-1, -1);