kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Support title-aware Window::setGeometry.

Browse source
This commit is contained in:
John Preston 2019-09-30 11:58:45 +03:00
parent 84d68e48c0
commit 11aa7bcd4e
7 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ui/platform/mac/ui_window_mac.h
View file

@ -21,6 +21,7 @@ public:
not_null<RpWidget*> body() override;
void setTitle(const QString &title) override;
void setSizeMin(QSize size) override;
void setGeometry(QRect rect) override;
private:
class Private;

9
ui/platform/mac/ui_window_mac.mm
View file

@ -205,7 +205,14 @@ void WindowHelper::toggleCustomTitle(bool visible) {
}
void WindowHelper::setSizeMin(QSize size) {
_window->setMinimumSize(size.width(), _title->height() + size.height());
_window->setMinimumSize(
size.width(),
(_title ? _title->height() : 0) + size.height());
}
void WindowHelper::setGeometry(QRect rect) {
_window->setGeometry(
rect.marginsAdded({ 0, (_title ? _title->height() : 0), 0, 0 }));
}
void WindowHelper::init() {

1
ui/platform/ui_platform_window.h
View file

@ -17,6 +17,7 @@ public:
[[nodiscard]] virtual not_null<RpWidget*> body() = 0;
virtual void setTitle(const QString &title) = 0;
virtual void setSizeMin(QSize size) = 0;
virtual void setGeometry(QRect rect) = 0;
virtual ~BasicWindowHelper() = default;
};

4
ui/platform/win/ui_window_win.cpp
View file

@ -103,6 +103,10 @@ void WindowHelper::setSizeMin(QSize size) {
_window->setMinimumSize(size.width(), _title->height() + size.height());
}
void WindowHelper::setGeometry(QRect rect) {
_window->setGeometry(rect.marginsAdded({ 0, _title->height(), 0, 0 }));
}
void WindowHelper::init() {
style::PaletteChanged(
) | rpl::start_with_next([=] {

1
ui/platform/win/ui_window_win.h
View file

@ -24,6 +24,7 @@ public:
not_null<RpWidget*> body() override;
void setTitle(const QString &title) override;
void setSizeMin(QSize size) override;
void setGeometry(QRect rect) override;
private:
class NativeFilter;

8
ui/widgets/window.cpp
View file

@ -42,4 +42,12 @@ void Window::setSizeMin(QSize size) {
}
}
void Window::setGeometry(QRect rect) {
if (_helper) {
_helper->setGeometry(rect);
} else {
RpWidget::setGeometry(rect);
}
}
} // namespace Ui

1
ui/widgets/window.h
View file

@ -23,6 +23,7 @@ public:
void setTitle(const QString &title);
void setSizeMin(QSize size);
void setGeometry(QRect rect);
private:
const std::unique_ptr<Platform::BasicWindowHelper> _helper;