chatterino2
Code Issues

Merge remote-tracking branch 'main_repo/master' into git_is_pepega

Browse Source 
check if works with new changes from master
This commit is contained in:
Mm2PL
2020-04-29 00:42:12 +02:00
parent 3d1950b32e 08678628d5
commit 84007d2edb
17 changed files with 108 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/BaseWidget.cpp
+3 -1
View File
@@ -9,6 +9,7 @@
#include <QIcon>
#include <QLayout>
#include <QtGlobal>
#include <algorithm>
namespace chatterino {
@@ -113,7 +114,8 @@ float BaseWidget::qtFontScale() const
{
if (auto window = dynamic_cast<BaseWindow *>(this->window()))
{
return this->scale() / window->nativeScale_;
// ensure no div by 0
return this->scale() / std::max<float>(0.01f, window->nativeScale_);
}
else
{
src/widgets/BaseWindow.cpp
+2 -2
View File
@@ -104,12 +104,12 @@ QRect BaseWindow::getBounds()
float BaseWindow::scale() const
{
return this->overrideScale().value_or(this->scale_);
return std::max<float>(0.01f, this->overrideScale().value_or(this->scale_));
}
float BaseWindow::qtFontScale() const
{
return this->scale() / this->nativeScale_;
return this->scale() / std::max<float>(0.01, this->nativeScale_);
}
void BaseWindow::init()
src/widgets/Label.cpp
+4 -2
View File
@@ -93,10 +93,12 @@ void Label::paintEvent(QPaintEvent *)
QFontMetrics metrics = getFonts()->getFontMetrics(
this->getFontStyle(),
this->scale() * 96.f / this->logicalDpiX() * deviceDpi);
this->scale() * 96.f /
std::max<float>(0.01, this->logicalDpiX() * deviceDpi));
painter.setFont(getFonts()->getFont(
this->getFontStyle(),
this->scale() * 96.f / this->logicalDpiX() * deviceDpi));
this->scale() * 96.f /
std::max<float>(0.02, this->logicalDpiX() * deviceDpi)));
int offset = this->getOffset();
src/widgets/Scrollbar.cpp
+11 -8
View File
@@ -357,7 +357,9 @@ void Scrollbar::mouseMoveEvent(QMouseEvent *event)
int delta = event->pos().y() - this->lastMousePosition_.y();
setDesiredValue(this->desiredValue_ +
qreal(delta) / this->trackHeight_ * this->maximum_);
qreal(delta) /
std::max<qreal>(0.00000002, this->trackHeight_ *
this->maximum_));
}
this->lastMousePosition_ = event->pos();
@@ -442,13 +444,14 @@ void Scrollbar::updateScroll()
this->trackHeight_ = this->height() - this->buttonHeight_ -
this->buttonHeight_ - MIN_THUMB_HEIGHT - 1;
this->thumbRect_ =
QRect(0,
int(this->currentValue_ / this->maximum_ * this->trackHeight_) +
1 + this->buttonHeight_,
this->width(),
int(this->largeChange_ / this->maximum_ * this->trackHeight_) +
MIN_THUMB_HEIGHT);
auto div = std::max<qreal>(0.0000001, this->maximum_);
this->thumbRect_ = QRect(
0,
int(this->currentValue_ / div * this->trackHeight_) + 1 +
this->buttonHeight_,
this->width(),
int(this->largeChange_ / div * this->trackHeight_) + MIN_THUMB_HEIGHT);
this->update();
}
src/widgets/dialogs/ColorPickerDialog.cpp
+1
View File
@@ -210,6 +210,7 @@ void ColorPickerDialog::initRecentColors(LayoutCreator<QWidget> &creator)
this->ui_.recent.colors.push_back(new ColorButton(*it, this));
auto *button = this->ui_.recent.colors[ind];
static_assert(RECENT_COLORS_PER_ROW != 0);
const int rowInd = (ind / RECENT_COLORS_PER_ROW) + 1;
const int columnInd = ind % RECENT_COLORS_PER_ROW;
src/widgets/helper/ChannelView.cpp
+10 -7
View File
@@ -319,7 +319,9 @@ void ChannelView::scaleChangedEvent(float scale)
{
auto factor = this->qtFontScale();
#ifdef Q_OS_MACOS
factor = scale * 80.f / this->logicalDpiX() * this->devicePixelRatioF();
factor = scale * 80.f /
std::max<float>(
0.01, this->logicalDpiX() * this->devicePixelRatioF());
#endif
this->goToBottom_->getLabel().setFont(
getFonts()->getFont(FontStyle::UiMedium, factor));
@@ -426,8 +428,9 @@ void ChannelView::updateScrollbar(
if (h < 0) // break condition
{
this->scrollBar_->setLargeChange((messages.size() - i) +
qreal(h) / message->getHeight());
this->scrollBar_->setLargeChange(
(messages.size() - i) +
qreal(h) / std::max<int>(1, message->getHeight()));
showScrollbar = true;
break;
@@ -964,8 +967,8 @@ void ChannelView::wheelEvent(QWheelEvent *event)
if (delta > 0)
{
qreal scrollFactor = fmod(desired, 1);
qreal currentScrollLeft =
int(scrollFactor * snapshot[i]->getHeight());
qreal currentScrollLeft = std::max<qreal>(
0.01, int(scrollFactor * snapshot[i]->getHeight()));
for (; i >= 0; i--)
{
@@ -997,8 +1000,8 @@ void ChannelView::wheelEvent(QWheelEvent *event)
{
delta = -delta;
qreal scrollFactor = 1 - fmod(desired, 1);
qreal currentScrollLeft =
int(scrollFactor * snapshot[i]->getHeight());
qreal currentScrollLeft = std::max<qreal>(
0.01, int(scrollFactor * snapshot[i]->getHeight()));
for (; i < snapshotLength; i++)
{
src/widgets/helper/NotebookTab.cpp
+5 -6
View File
@@ -282,12 +282,11 @@ void NotebookTab::paintEvent(QPaintEvent *)
QPainter painter(this);
float scale = this->scale();
painter.setFont(getApp()->fonts->getFont(
FontStyle::UiTabs,
scale * 96.f / this->logicalDpiX() * deviceDpi(this)));
QFontMetrics metrics = app->fonts->getFontMetrics(
FontStyle::UiTabs,
scale * 96.f / this->logicalDpiX() * deviceDpi(this));
auto div = std::max<float>(0.01f, this->logicalDpiX() * deviceDpi(this));
painter.setFont(
getApp()->fonts->getFont(FontStyle::UiTabs, scale * 96.f / div));
QFontMetrics metrics =
app->fonts->getFontMetrics(FontStyle::UiTabs, scale * 96.f / div);
int height = int(scale * NOTEBOOK_TAB_HEIGHT);
src/widgets/settingspages/AboutPage.cpp
+5 -2
View File
@@ -32,8 +32,11 @@ AboutPage::AboutPage()
auto logo = layout.emplace<QLabel>().assign(&this->logo_);
logo->setPixmap(pixmap);
logo->setFixedSize(PIXMAP_WIDTH,
PIXMAP_WIDTH * pixmap.height() / pixmap.width());
if (pixmap.width() != 0)
{
logo->setFixedSize(PIXMAP_WIDTH,
PIXMAP_WIDTH * pixmap.height() / pixmap.width());
}
logo->setScaledContents(true);
// this does nothing
src/widgets/settingspages/GeneralPage.cpp
+2
View File
@@ -359,6 +359,8 @@ void GeneralPage::initLayout(SettingsLayout &layout)
// layout.addCheckbox("Mark last message you read");
// layout.addDropdown("Last read message style", {"Default"});
layout.addCheckbox("Show deleted messages", s.hideModerated, true);
layout.addCheckbox("Highlight messages redeemed with Channel Points",
s.enableRedeemedHighlight);
layout.addDropdown<QString>(
"Timestamps",
{"Disable", "h:mm", "hh:mm", "h:mm a", "hh:mm a", "h:mm:ss", "hh:mm:ss",
src/widgets/splits/SplitContainer.cpp
+14 -8
View File
@@ -962,8 +962,10 @@ void SplitContainer::Node::insertNextToThis(Split *_split, Direction _direction)
{
auto &siblings = this->parent_->children_;
qreal width = this->parent_->geometry_.width() / siblings.size();
qreal height = this->parent_->geometry_.height() / siblings.size();
qreal width = this->parent_->geometry_.width() /
std::max<qreal>(0.0001, siblings.size());
qreal height = this->parent_->geometry_.height() /
std::max<qreal>(0.0001, siblings.size());
if (siblings.size() == 1)
{
@@ -1117,16 +1119,20 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
// vars
qreal minSize = qreal(48 * _scale);
qreal totalFlex = this->getChildrensTotalFlex(isVertical);
qreal totalFlex = std::max<qreal>(
0.0001, this->getChildrensTotalFlex(isVertical));
qreal totalSize = std::accumulate(
this->children_.begin(), this->children_.end(), qreal(0),
[=](int val, std::unique_ptr<Node> &node) {
return val + std::max<qreal>(this->getSize(isVertical) /
totalFlex *
node->getFlex(isVertical),
minSize);
return val + std::max<qreal>(
this->getSize(isVertical) /
std::max<qreal>(0.0001, totalFlex) *
node->getFlex(isVertical),
minSize);
});
totalSize = std::max<qreal>(0.0001, totalSize);
qreal sizeMultiplier = this->getSize(isVertical) / totalSize;
QRectF childRect = this->geometry_;
@@ -1242,7 +1248,7 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
}
}
break;
};
}
}
SplitContainer::Node::Type SplitContainer::Node::toContainerType(Direction _dir)