Skip to content

Remove admin icon is asset isn't admin #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blondfrogs merged 2 commits into from
Dec 5, 2018
Merged

Remove admin icon is asset isn't admin #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
191c03f
Remove admin icon is asset isn't admin
Dec 5, 2018
3dd0acd
Update version to 2.2.0
Dec 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
Expand Down
6 changes: 4 additions & 2 deletions src/qt/overviewpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ Q_OBJECT
/** Get the icon for the administrator of the asset */
QPixmap pixmap = qvariant_cast<QPixmap>(index.data(Qt::DecorationRole));

bool admin = index.data(AssetTableModel::AdministratorRole).toBool();

/** Need to know the heigh to the pixmap. If it is 0 we don't we dont own this asset so dont have room for the icon */
int nIconSize = pixmap.height();
int nIconSize = admin ? pixmap.height() : 0;
int extraNameSpacing = 12;
if (nIconSize)
extraNameSpacing = 0;
Expand All @@ -182,7 +184,7 @@ Q_OBJECT
QLinearGradient gradient(mainRect.topLeft(), mainRect.bottomRight());

// Select the color of the gradient
if (index.data(AssetTableModel::AdministratorRole).toBool()) {
if (admin) {
if (darkModeEnabled) {
gradient.setColorAt(0, COLOR_ADMIN_CARD_DARK);
gradient.setColorAt(1, COLOR_ADMIN_CARD_DARK);
Expand Down