piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinQt: Resolve deprecated usage of margin()

Browse Source 
This function has been marked as obsolete. In Qt 6.0 it's removed
entirely, so we must use getContentsMargin() explicitly instead
(margin() would do this for us).

Ditto for setMargin(), in which case we use setContentsMargin instead.
setMargin() would just pass its argument to all four parameters of
setContentsMargin(), so we can do the same.
This commit is contained in:
Lioncash
2021-01-13 04:33:01 -05:00
parent 46ca371ef3
commit 892154f7ea
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt/QtUtils/FlowLayout.cpp
View File

@ -151,7 +151,11 @@ QSize FlowLayout::minimumSize() const
for (const auto& item : m_item_list)
size = size.expandedTo(item->minimumSize());
size += QSize(2 * margin(), 2 * margin());
// Any direction's margin works, as they all set the same within the constructor.
int margin = 0;
getContentsMargins(&margin, nullptr, nullptr, nullptr);
size += QSize(2 * margin, 2 * margin);
return size;
}