Skip to content

Commit

Permalink
Merge pull request LMMS#4943 from RoxasKH/new-monstro-icons
Browse files Browse the repository at this point in the history
New monstro icons
  • Loading branch information
LostRobotMusic authored Apr 13, 2019
2 parents ac257f0 + be31a55 commit b3461e2
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 3 deletions.
Binary file modified plugins/monstro/exp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/moog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/noise.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/ramp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/saw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/sin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/sinabs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/sqr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/sqrsoft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/monstro/tri.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/gui/widgets/ComboBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) :
Expand Down Expand Up @@ -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 )
{
Expand Down Expand Up @@ -251,4 +251,3 @@ void ComboBox::setItem( QAction* item )




0 comments on commit b3461e2

Please sign in to comment.