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
8c072295
Commit
8c072295
authored
Aug 17, 2015
by
Zach
Browse files
Merge pull request #1386 from Fizztastic/fix_1383
Fix linked cardwidget not showing PT/Loyalty
parents
487cbb23
f3c43cb5
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/cardinfowidget.cpp
View file @
8c072295
...
@@ -99,14 +99,12 @@ void CardInfoWidget::minimizeClicked(int newMinimized)
...
@@ -99,14 +99,12 @@ void CardInfoWidget::minimizeClicked(int newMinimized)
bool
CardInfoWidget
::
shouldShowPowTough
()
bool
CardInfoWidget
::
shouldShowPowTough
()
{
{
// return (!info->getPowTough().isEmpty() && (minimized != 0));
return
!
info
->
getPowTough
().
isEmpty
();
return
(
minimized
!=
0
);
}
}
bool
CardInfoWidget
::
shouldShowLoyalty
()
bool
CardInfoWidget
::
shouldShowLoyalty
()
{
{
// return ((info->getLoyalty() > 0) && (minimized != 0));
return
(
info
->
getLoyalty
()
>
0
);
return
(
minimized
!=
0
);
}
}
void
CardInfoWidget
::
setMinimized
(
int
_minimized
)
void
CardInfoWidget
::
setMinimized
(
int
_minimized
)
...
...
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