procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move PiP controls to one corner.

This commit is contained in:
John Preston 2020-02-03 14:13:07 +04:00
parent 47f9978c46
commit e095c325b3
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/media/view/media_view_pip.cpp
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/audio/media_audio.h" #include "media/audio/media_audio.h"
#include "data/data_document.h" #include "data/data_document.h"
#include "core/application.h" #include "core/application.h"
#include "base/platform/base_platform_info.h"
#include "ui/platform/ui_platform_utility.h" #include "ui/platform/ui_platform_utility.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/wrap/fade_wrap.h" #include "ui/wrap/fade_wrap.h"
@ -33,6 +34,10 @@ namespace {
constexpr auto kPipLoaderPriority = 2; constexpr auto kPipLoaderPriority = 2;
constexpr auto kSaveGeometryTimeout = crl::time(1000); constexpr auto kSaveGeometryTimeout = crl::time(1000);
[[nodiscard]] bool IsWindowControlsOnLeft() {
return Platform::IsMac();
}
[[nodiscard]] QRect ScreenFromPosition(QPoint point) { [[nodiscard]] QRect ScreenFromPosition(QPoint point) {
const auto screen = QGuiApplication::screenAt(point); const auto screen = QGuiApplication::screenAt(point);
const auto use = screen ? screen : QGuiApplication::primaryScreen(); const auto use = screen ? screen : QGuiApplication::primaryScreen();
@ -837,12 +842,22 @@ void Pip::setupButtons() {
rect.y(), rect.y(),
st::pipCloseIcon.width() + 2 * skip, st::pipCloseIcon.width() + 2 * skip,
st::pipCloseIcon.height() + 2 * skip); st::pipCloseIcon.height() + 2 * skip);
_close.icon = _close.area.marginsRemoved({ skip, skip, skip, skip }); _enlarge.area = QRect(
_enlarge.area = _enlarge.icon = QRect( _close.area.x() + _close.area.width(),
rect.x() + rect.width() - 2 * skip - st::pipEnlargeIcon.width(),
rect.y(), rect.y(),
st::pipEnlargeIcon.width() + 2 * skip, st::pipEnlargeIcon.width() + 2 * skip,
st::pipEnlargeIcon.height() + 2 * skip); st::pipEnlargeIcon.height() + 2 * skip);
if (!IsWindowControlsOnLeft()) {
_close.area.moveLeft(rect.x()
+ rect.width()
- (_close.area.x() - rect.x())
- _close.area.width());
_enlarge.area.moveLeft(rect.x()
+ rect.width()
- (_enlarge.area.x() - rect.x())
- _enlarge.area.width());
}
_close.icon = _close.area.marginsRemoved({ skip, skip, skip, skip });
_enlarge.icon = _enlarge.area.marginsRemoved( _enlarge.icon = _enlarge.area.marginsRemoved(
{ skip, skip, skip, skip }); { skip, skip, skip, skip });
_play.icon = QRect( _play.icon = QRect(