RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Construct WindowControlsLayout without variable

This commit is contained in:
Ilya Fedin 2020-11-12 11:28:31 +04:00 committed by John Preston
parent 5c8a19b7f7
commit e4b9900a06
3 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -964,31 +964,30 @@ Window::ControlsLayout WindowControlsLayout() {
);
}
Window::ControlsLayout controls;
controls.left = controlsLeft;
controls.right = controlsRight;
return controls;
return Window::ControlsLayout{
.left = controlsLeft,
.right = controlsRight
};
}
#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
Window::ControlsLayout controls;
if (DesktopEnvironment::IsUnity()) {
controls.left = {
Window::Control::Close,
Window::Control::Minimize,
Window::Control::Maximize,
return Window::ControlsLayout{
.left = {
Window::Control::Close,
Window::Control::Minimize,
Window::Control::Maximize,
}
};
} else {
controls.right = {
Window::Control::Minimize,
Window::Control::Maximize,
Window::Control::Close,
return Window::ControlsLayout{
.right = {
Window::Control::Minimize,
Window::Control::Maximize,
Window::Control::Close,
}
};
}
return controls;
}
} // namespace Platform

13
Telegram/SourceFiles/platform/mac/specific_mac.mm
View File

@ -204,14 +204,13 @@ void IgnoreApplicationActivationRightNow() {
}
Window::ControlsLayout WindowControlsLayout() {
Window::ControlsLayout controls;
controls.left = {
Window::Control::Close,
Window::Control::Minimize,
Window::Control::Maximize,
return Window::ControlsLayout{
.left = {
Window::Control::Close,
Window::Control::Minimize,
Window::Control::Maximize,
}
};
return controls;
}
} // namespace Platform

13
Telegram/SourceFiles/platform/win/specific_win.cpp
View File

@ -325,14 +325,13 @@ bool ShowWindowMenu(QWindow *window) {
}
Window::ControlsLayout WindowControlsLayout() {
Window::ControlsLayout controls;
controls.right = {
Window::Control::Minimize,
Window::Control::Maximize,
Window::Control::Close,
return Window::ControlsLayout{
.right = {
Window::Control::Minimize,
Window::Control::Maximize,
Window::Control::Close,
}
};
return controls;
}
} // namespace Platform