ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Draw fixes for Qt Tas piano roll arrows and bookmark labels.

This commit is contained in:
mjbudd77 2021-12-12 14:13:54 -05:00
parent a3b3cf563b
commit 0ad04f819e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/drivers/Qt/TasEditor/TasEditorWindow.cpp
View File

@ -82,10 +82,11 @@ enum DRAG_MODES
DRAG_MODE_SELECTION, DRAG_MODE_SELECTION,
DRAG_MODE_DESELECTION, DRAG_MODE_DESELECTION,
}; };
#define BOOKMARKS_WITH_BLUE_ARROW 0x00010000 #define BOOKMARKS_WITH_NO_ARROW 0x00010000
#define BOOKMARKS_WITH_GREEN_ARROW 0x00020000 #define BOOKMARKS_WITH_BLUE_ARROW 0x00020000
#define BLUE_ARROW_IMAGE_ID 0x00040000 #define BOOKMARKS_WITH_GREEN_ARROW 0x00040000
#define GREEN_ARROW_IMAGE_ID 0x00080000 #define BLUE_ARROW_IMAGE_ID 0x00080000
#define GREEN_ARROW_IMAGE_ID 0x00100000
#define GREEN_BLUE_ARROW_IMAGE_ID (BLUE_ARROW_IMAGE_ID | GREEN_ARROW_IMAGE_ID) #define GREEN_BLUE_ARROW_IMAGE_ID (BLUE_ARROW_IMAGE_ID | GREEN_ARROW_IMAGE_ID)
#define MARKER_DRAG_COUNTDOWN_MAX 14 #define MARKER_DRAG_COUNTDOWN_MAX 14
@ -3998,7 +3999,7 @@ void QPianoRoll::drawArrow( QPainter *painter, int xl, int yl, int value )
w = pxCharWidth; w = pxCharWidth;
h = pxLineSpacing-2; h = pxLineSpacing-2;
if ( (value & BOOKMARKS_WITH_GREEN_ARROW) || (value & BOOKMARKS_WITH_BLUE_ARROW) ) if ( (value & BOOKMARKS_WITH_GREEN_ARROW) || (value & BOOKMARKS_WITH_BLUE_ARROW) || (value & BOOKMARKS_WITH_NO_ARROW) )
{ {
char txt[4]; char txt[4];
int bookmarkNum; int bookmarkNum;
@ -4010,10 +4011,12 @@ void QPianoRoll::drawArrow( QPainter *painter, int xl, int yl, int value )
painter->drawText( x, y+pxLineTextOfs, tr(txt) ); painter->drawText( x, y+pxLineTextOfs, tr(txt) );
draw2ndArrow = hasBookmark = true; hasBookmark = true;
draw1stArrow = false; draw1stArrow = false;
draw2ndArrow = (value & BOOKMARKS_WITH_NO_ARROW) ? false : true;
x += pxCharWidth; x += pxCharWidth;
} }
p[0] = QPoint( x, y ); p[0] = QPoint( x, y );
@ -4052,6 +4055,7 @@ void QPianoRoll::drawArrow( QPainter *painter, int xl, int yl, int value )
{ {
painter->setBrush( arrowColor1 ); painter->setBrush( arrowColor1 );
painter->drawPolygon( p, 3 ); painter->drawPolygon( p, 3 );
x += pxCharWidth;
} }
if ( draw2ndArrow ) if ( draw2ndArrow )
@ -5888,6 +5892,10 @@ void QPianoRoll::paintEvent(QPaintEvent *event)
{ {
iImage |= BOOKMARKS_WITH_BLUE_ARROW; iImage |= BOOKMARKS_WITH_BLUE_ARROW;
} }
else
{
iImage |= BOOKMARKS_WITH_NO_ARROW;
}
} }
if ( iImage >= 0 ) if ( iImage >= 0 )