diff --git a/CHANGELOG.md b/CHANGELOG.md index f272df9f..0277e2a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Bugfix: Fixed some Twitch commands not getting tab-completed correctly. (#6143) - Bugfix: Fixed shared chat badges displaying pixelated when Chatterino is scaled too much. (#6146) - Bugfix: Fixed a crash that could occur when eventsub was enabled and Chatterino was attached to a conhost on Windows that was later gone. (#6161) +- Bugfix: Fixed some minor typos. (#6196) - Dev: Mini refactor of Split. (#6148) - Dev: Conan will no longer generate a `CMakeUserPresets.json` file. (#6117) - Dev: Pass `--force-openssl` when installing from CMake in Qt 6.8+. (#6129) diff --git a/src/widgets/AccountSwitchPopup.cpp b/src/widgets/AccountSwitchPopup.cpp index a3d47512..a939b7ea 100644 --- a/src/widgets/AccountSwitchPopup.cpp +++ b/src/widgets/AccountSwitchPopup.cpp @@ -45,7 +45,7 @@ AccountSwitchPopup::AccountSwitchPopup(QWidget *parent) this->getLayoutContainer()->setLayout(vbox); - this->setScaleIndependantSize(200, 200); + this->setScaleIndependentSize(200, 200); this->themeChangedEvent(); } diff --git a/src/widgets/BaseWidget.cpp b/src/widgets/BaseWidget.cpp index 74399803..30553788 100644 --- a/src/widgets/BaseWidget.cpp +++ b/src/widgets/BaseWidget.cpp @@ -70,7 +70,7 @@ void BaseWidget::setScale(float value) this->scaleChangedEvent(this->scale()); this->scaleChanged.invoke(this->scale()); - this->setScaleIndependantSize(this->scaleIndependantSize()); + this->setScaleIndependentSize(this->scaleIndependentSize()); } void BaseWidget::setOverrideScale(std::optional value) @@ -84,29 +84,29 @@ std::optional BaseWidget::overrideScale() const return this->overrideScale_; } -QSize BaseWidget::scaleIndependantSize() const +QSize BaseWidget::scaleIndependentSize() const { - return this->scaleIndependantSize_; + return this->scaleIndependentSize_; } -int BaseWidget::scaleIndependantWidth() const +int BaseWidget::scaleIndependentWidth() const { - return this->scaleIndependantSize_.width(); + return this->scaleIndependentSize_.width(); } -int BaseWidget::scaleIndependantHeight() const +int BaseWidget::scaleIndependentHeight() const { - return this->scaleIndependantSize_.height(); + return this->scaleIndependentSize_.height(); } -void BaseWidget::setScaleIndependantSize(int width, int height) +void BaseWidget::setScaleIndependentSize(int width, int height) { - this->setScaleIndependantSize(QSize(width, height)); + this->setScaleIndependentSize(QSize(width, height)); } -void BaseWidget::setScaleIndependantSize(QSize size) +void BaseWidget::setScaleIndependentSize(QSize size) { - this->scaleIndependantSize_ = size; + this->scaleIndependentSize_ = size; if (size.width() > 0) { @@ -118,16 +118,16 @@ void BaseWidget::setScaleIndependantSize(QSize size) } } -void BaseWidget::setScaleIndependantWidth(int value) +void BaseWidget::setScaleIndependentWidth(int value) { - this->setScaleIndependantSize( - QSize(value, this->scaleIndependantSize_.height())); + this->setScaleIndependentSize( + QSize(value, this->scaleIndependentSize_.height())); } -void BaseWidget::setScaleIndependantHeight(int value) +void BaseWidget::setScaleIndependentHeight(int value) { - this->setScaleIndependantSize( - QSize(this->scaleIndependantSize_.width(), value)); + this->setScaleIndependentSize( + QSize(this->scaleIndependentSize_.width(), value)); } void BaseWidget::childEvent(QChildEvent *event) diff --git a/src/widgets/BaseWidget.hpp b/src/widgets/BaseWidget.hpp index 16e98d54..697102b6 100644 --- a/src/widgets/BaseWidget.hpp +++ b/src/widgets/BaseWidget.hpp @@ -26,13 +26,13 @@ public: std::optional overrideScale() const; void setOverrideScale(std::optional); - QSize scaleIndependantSize() const; - int scaleIndependantWidth() const; - int scaleIndependantHeight() const; - void setScaleIndependantSize(int width, int height); - void setScaleIndependantSize(QSize); - void setScaleIndependantWidth(int value); - void setScaleIndependantHeight(int value); + QSize scaleIndependentSize() const; + int scaleIndependentWidth() const; + int scaleIndependentHeight() const; + void setScaleIndependentSize(int width, int height); + void setScaleIndependentSize(QSize); + void setScaleIndependentWidth(int value); + void setScaleIndependentHeight(int value); protected: void childEvent(QChildEvent *) override; @@ -56,7 +56,7 @@ protected: private: float scale_{1.f}; std::optional overrideScale_; - QSize scaleIndependantSize_; + QSize scaleIndependentSize_; std::vector widgets_; diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp index 31cf4d61..6f016545 100644 --- a/src/widgets/BaseWindow.cpp +++ b/src/widgets/BaseWindow.cpp @@ -676,7 +676,7 @@ TitleBarButton *BaseWindow::addTitleBarButton(const TitleBarButtonStyle &style, std::function onClicked) { TitleBarButton *button = new TitleBarButton; - button->setScaleIndependantSize(30, 30); + button->setScaleIndependentSize(30, 30); this->ui_.buttons.push_back(button); this->ui_.titlebarBox->insertWidget(1, button); @@ -692,7 +692,7 @@ TitleBarButton *BaseWindow::addTitleBarButton(const TitleBarButtonStyle &style, EffectLabel *BaseWindow::addTitleBarLabel(std::function onClicked) { EffectLabel *button = new EffectLabel; - button->setScaleIndependantHeight(30); + button->setScaleIndependentHeight(30); this->ui_.buttons.push_back(button); this->ui_.titlebarBox->insertWidget(1, button); diff --git a/src/widgets/DraggablePopup.cpp b/src/widgets/DraggablePopup.cpp index b7b931de..0717515f 100644 --- a/src/widgets/DraggablePopup.cpp +++ b/src/widgets/DraggablePopup.cpp @@ -121,7 +121,7 @@ Button *DraggablePopup::createPinButton() { this->pinButton_ = new Button(this); this->pinButton_->setPixmap(getTheme()->buttons.pin); - this->pinButton_->setScaleIndependantSize(18, 18); + this->pinButton_->setScaleIndependentSize(18, 18); this->pinButton_->setToolTip("Pin Window"); QObject::connect(this->pinButton_, &Button::leftClicked, this, diff --git a/src/widgets/dialogs/EditUserNotesDialog.cpp b/src/widgets/dialogs/EditUserNotesDialog.cpp index c742286d..cfdcc6bd 100644 --- a/src/widgets/dialogs/EditUserNotesDialog.cpp +++ b/src/widgets/dialogs/EditUserNotesDialog.cpp @@ -17,7 +17,7 @@ EditUserNotesDialog::EditUserNotesDialog(QWidget *parent) }, parent) { - this->setScaleIndependantSize(500, 350); + this->setScaleIndependentSize(500, 350); auto layout = LayoutCreator(this->getLayoutContainer()) .setLayoutType(); diff --git a/src/widgets/dialogs/UpdateDialog.cpp b/src/widgets/dialogs/UpdateDialog.cpp index a43f6e4e..d00e3527 100644 --- a/src/widgets/dialogs/UpdateDialog.cpp +++ b/src/widgets/dialogs/UpdateDialog.cpp @@ -44,8 +44,8 @@ UpdateDialog::UpdateDialog() this->updateStatusChanged(status); }); - this->setScaleIndependantHeight(150); - this->setScaleIndependantWidth(250); + this->setScaleIndependentHeight(150); + this->setScaleIndependentWidth(250); } void UpdateDialog::updateStatusChanged(Updates::Status status) diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index 9197fcc7..4e673fa0 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -71,7 +71,7 @@ Label *addCopyableLabel(LayoutCreator box, const char *tooltip, button.assign(copyButton); } button->setPixmap(getApp()->getThemes()->buttons.copy); - button->setScaleIndependantSize(18, 18); + button->setScaleIndependentSize(18, 18); button->setDim(Button::Dim::Lots); button->setToolTip(tooltip); QObject::connect( @@ -274,7 +274,7 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split) // avatar auto avatar = head.emplace