mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 23:45:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'game_media' into player

Browse Source 
Conflicts:
	Telegram/SourceFiles/core/basic_types.h
	Telegram/SourceFiles/sysbuttons.h
	Telegram/SourceFiles/title.cpp
This commit is contained in:
John Preston
2016-09-29 16:48:43 +03:00
parent 903795d0e5 01a5aa30df
commit 5b3ac58578
64 changed files with 1674 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -959,31 +959,31 @@ HitTestType MainWindow::hitTest(const QPoint &p) const {
if (!windowState().testFlag(Qt::WindowMaximized)) {
if (y < raw) {
if (x < raw) {
return HitTestTopLeft;
return HitTestType::TopLeft;
} else if (x > w - raw - 1) {
return HitTestTopRight;
return HitTestType::TopRight;
}
return HitTestTop;
return HitTestType::Top;
} else if (y > h - raw - 1) {
if (x < raw) {
return HitTestBottomLeft;
return HitTestType::BottomLeft;
} else if (x > w - raw - 1) {
return HitTestBottomRight;
return HitTestType::BottomRight;
}
return HitTestBottom;
return HitTestType::Bottom;
} else if (x < raw) {
return HitTestLeft;
return HitTestType::Left;
} else if (x > w - raw - 1) {
return HitTestRight;
return HitTestType::Right;
}
}
HitTestType titleTest = title->hitTest(p - title->geometry().topLeft());
if (titleTest) {
auto titleTest = title->hitTest(p - title->geometry().topLeft());
if (titleTest != HitTestType::None) {
return titleTest;
} else if (x >= 0 && y >= 0 && x < w && y < h) {
return HitTestClient;
return HitTestType::Client;
}
return HitTestNone;
return HitTestType::None;
}
QRect MainWindow::iconRect() const {