Merge pull request #4943 from RoxasKH/new-monstro-icons

New monstro icons
This commit is contained in:
Lost Robot
2019-04-13 15:00:14 -06:00
committed by GitHub
11 changed files with 2 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 711 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

After

Width:  |  Height:  |  Size: 489 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 530 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 539 B

After

Width:  |  Height:  |  Size: 453 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 602 B

After

Width:  |  Height:  |  Size: 566 B

View File

@@ -42,7 +42,7 @@ QPixmap * ComboBox::s_background = NULL;
QPixmap * ComboBox::s_arrow = NULL;
QPixmap * ComboBox::s_arrowSelected = NULL;
const int CB_ARROW_BTN_WIDTH = 20;
const int CB_ARROW_BTN_WIDTH = 18;
ComboBox::ComboBox( QWidget * _parent, const QString & _name ) :
@@ -198,7 +198,7 @@ void ComboBox::paintEvent( QPaintEvent * _pe )
QPixmap * arrow = m_pressed ? s_arrowSelected : s_arrow;
p.drawPixmap( width() - CB_ARROW_BTN_WIDTH + 5, 4, *arrow );
p.drawPixmap( width() - CB_ARROW_BTN_WIDTH + 3, 4, *arrow );
if( model() && model()->size() > 0 )
{
@@ -251,4 +251,3 @@ void ComboBox::setItem( QAction* item )