Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
1c2ddccb
Commit
1c2ddccb
authored
Jul 07, 2015
by
Fabio Bas
Browse files
Order cards by name in deck-load screen; fix #247
parent
685aa99a
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/deckview.cpp
View file @
1c2ddccb
...
...
@@ -241,6 +241,13 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList<QPair<int, int>
return
QSizeF
(
getCardTypeTextWidth
()
+
totalWidth
,
totalHeight
+
separatorY
+
paddingY
);
}
bool
sortCardsByName
(
DeckViewCard
*
c1
,
DeckViewCard
*
c2
)
{
if
(
c1
&&
c2
)
return
c1
->
getName
()
<
c2
->
getName
();
return
false
;
}
void
DeckViewCardContainer
::
rearrangeItems
(
const
QList
<
QPair
<
int
,
int
>
>
&
rowsAndCols
)
{
currentRowsAndCols
=
rowsAndCols
;
...
...
@@ -257,6 +264,7 @@ void DeckViewCardContainer::rearrangeItems(const QList<QPair<int, int> > &rowsAn
QList
<
QString
>
cardTypeList
=
cardsByType
.
uniqueKeys
();
QList
<
DeckViewCard
*>
row
=
cardsByType
.
values
(
cardTypeList
[
i
]);
qSort
(
row
.
begin
(),
row
.
end
(),
sortCardsByName
);
for
(
int
j
=
0
;
j
<
row
.
size
();
++
j
)
{
DeckViewCard
*
card
=
row
[
j
];
card
->
setPos
(
x
+
(
j
%
tempCols
)
*
CARD_WIDTH
,
yUntilNow
+
(
j
/
tempCols
)
*
CARD_HEIGHT
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment