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

Minor vertical adjustments to Qt piano roll text placement.

This commit is contained in:
mjbudd77 2022-01-09 14:56:03 -05:00
parent 80a7afd7f5
commit 93ee0efe3b
2 changed files with 22 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6043,35 +6043,6 @@ void QPianoRoll::startDraggingMarker(int mouseX, int mouseY, int rowIndex, int c
QColor bgColor = (taseditorConfig->bindMarkersToInput) ? QColor( BINDMARKED_FRAMENUM_COLOR ) : QColor( MARKED_FRAMENUM_COLOR ); QColor bgColor = (taseditorConfig->bindMarkersToInput) ? QColor( BINDMARKED_FRAMENUM_COLOR ) : QColor( MARKED_FRAMENUM_COLOR );
QSize iconSize(pxWidthFrameCol, pxLineSpacing); QSize iconSize(pxWidthFrameCol, pxLineSpacing);
//QPixmap pixmap( iconSize );
//pixmap.fill(Qt::transparent);
//QPainter painter(&pixmap);
//if (painter.isActive())
//{
// char txt[32];
// sprintf( txt, "%07i", rowIndex );
// font.setItalic(true);
// font.setBold(false);
// painter.setFont(font);
// //I want to make the title bar pasted on the content
// //But you can't get the image of the default title bar, just draw a rectangular box
// //If the external theme color is set, you need to change it
// QRect title_rect{0,0,pixmap.width(),pixmap.height()};
// painter.fillRect(title_rect,bgColor);
// painter.drawText(title_rect,Qt::AlignCenter, txt);
// painter.drawRect(pixmap.rect().adjusted(0,0,-1,-1));
// font.setItalic(false);
// font.setBold(true);
//}
//painter.end();
//QMimeData *mime = new QMimeData;
//mime->setText( QString("MARKER") );
mkrDrag = new markerDragPopup(this); mkrDrag = new markerDragPopup(this);
mkrDrag->resize( iconSize ); mkrDrag->resize( iconSize );
@ -6086,13 +6057,6 @@ void QPianoRoll::startDraggingMarker(int mouseX, int mouseY, int rowIndex, int c
font.setItalic(false); font.setItalic(false);
font.setBold(true); font.setBold(true);
//mkrDrag->setPixmap(pixmap);
//QDrag *drag = new QDrag(this);
//drag->setMimeData(mime);
//drag->setPixmap(pixmap);
//drag->setHotSpot(QPoint(0,0));
// start dragging the Marker // start dragging the Marker
dragMode = DRAG_MODE_MARKER; dragMode = DRAG_MODE_MARKER;
markerDragFrameNumber = rowIndex; markerDragFrameNumber = rowIndex;
@ -6108,35 +6072,6 @@ void QPianoRoll::startDraggingMarker(int mouseX, int mouseY, int rowIndex, int c
} }
}); });
//Drag is released after the mouse bounces up, at this time to judge whether it is dragged to the outside
//connect(drag, &QDrag::destroyed, this,[=]
//{
// int line, col;
// fceuCriticalSection emuLock;
// QPoint pos = this->mapFromGlobal(QCursor::pos());
// QPoint c = convPixToCursor( pos );
// //printf("Drag Destroyed\n");
// mouse_x = pos.x();
// mouse_y = pos.y();
// if ( c.y() >= 0 )
// {
// line = lineOffset + c.y();
// }
// else
// {
// line = -1;
// }
// col = calcColumn( pos.x() );
// rowUnderMouse = realRowUnderMouse = line;
// columnUnderMouse = col;
// finishDrag();
//});
//drag->exec(Qt::MoveAction);
mkrDrag->show(); mkrDrag->show();
update(); update();
@ -6397,7 +6332,8 @@ void QPianoRoll::paintEvent(QPaintEvent *event)
//painter.drawText( x, pxLineTextOfs, tr("Frame#") ); //painter.drawText( x, pxLineTextOfs, tr("Frame#") );
rect = QRect( -pxLineXScroll + pxFrameColX, 0, pxWidthFrameCol, pxLineSpacing ); rect = QRect( -pxLineXScroll + pxFrameColX, 0, pxWidthFrameCol, pxLineSpacing );
painter.drawText( rect, Qt::AlignCenter, tr("Frame#") ); //painter.drawText( rect, Qt::AlignCenter, tr("Frame#") );
painter.drawText( rect, Qt::AlignHCenter | Qt::AlignBottom, tr("Frame#") );
//font.setBold(false); //font.setBold(false);
//painter.setFont(font); //painter.setFont(font);
@ -6666,12 +6602,14 @@ void QPianoRoll::paintEvent(QPaintEvent *event)
if ( data & (0x01 << j) ) if ( data & (0x01 << j) )
{ {
//painter.drawText( x + pxCharWidth, y+pxLineTextOfs, tr(buttonNames[j]) ); //painter.drawText( x + pxCharWidth, y+pxLineTextOfs, tr(buttonNames[j]) );
painter.drawText( rect, Qt::AlignCenter, tr(buttonNames[j]) ); //painter.drawText( rect, Qt::AlignCenter, tr(buttonNames[j]) );
painter.drawText( rect, Qt::AlignHCenter | Qt::AlignBottom, tr(buttonNames[j]) );
} }
else if ( hotChangeVal > 0 ) else if ( hotChangeVal > 0 )
{ {
//painter.drawText( x + pxCharWidth, y+pxLineTextOfs, tr("-") ); //painter.drawText( x + pxCharWidth, y+pxLineTextOfs, tr("-") );
painter.drawText( rect, Qt::AlignCenter, tr("-") ); //painter.drawText( rect, Qt::AlignCenter, tr("-") );
painter.drawText( rect, Qt::AlignHCenter | Qt::AlignBottom, tr("-") );
} }
x += pxWidthBtnCol; x += pxWidthBtnCol;
} }
@ -6705,7 +6643,8 @@ void QPianoRoll::paintEvent(QPaintEvent *event)
} }
painter.setFont(font); painter.setFont(font);
//painter.drawText( x, y+pxLineTextOfs, tr(stmp) ); //painter.drawText( x, y+pxLineTextOfs, tr(stmp) );
painter.drawText( rect, Qt::AlignCenter, tr(stmp) ); //painter.drawText( rect, Qt::AlignCenter, tr(stmp) );
painter.drawText( rect, Qt::AlignHCenter | Qt::AlignBottom, tr(stmp) );
if ( font.italic() ) if ( font.italic() )
{ {
@ -6799,7 +6738,8 @@ void QPianoRoll::paintEvent(QPaintEvent *event)
rect = QRect( x, 0, pxWidthBtnCol, pxLineSpacing ); rect = QRect( x, 0, pxWidthBtnCol, pxLineSpacing );
painter.setPen( QPen(headerLightsColors[ headerColors[COLUMN_JOYPAD1_A + (i*8) + j] ],1) ); painter.setPen( QPen(headerLightsColors[ headerColors[COLUMN_JOYPAD1_A + (i*8) + j] ],1) );
//painter.drawText( x + pxCharWidth, pxLineTextOfs, tr(buttonNames[j]) ); //painter.drawText( x + pxCharWidth, pxLineTextOfs, tr(buttonNames[j]) );
painter.drawText( rect, Qt::AlignCenter, tr(buttonNames[j]) ); //painter.drawText( rect, Qt::AlignCenter, tr(buttonNames[j]) );
painter.drawText( rect, Qt::AlignHCenter | Qt::AlignBottom, tr(buttonNames[j]) );
x += pxWidthBtnCol; x += pxWidthBtnCol;
} }
@ -7524,7 +7464,8 @@ void markerDragPopup::paintEvent(QPaintEvent *event)
//If the external theme color is set, you need to change it //If the external theme color is set, you need to change it
QRect title_rect{0,0,w,h}; QRect title_rect{0,0,w,h};
painter.fillRect(title_rect,bgColor); painter.fillRect(title_rect,bgColor);
painter.drawText(title_rect,Qt::AlignCenter, txt); //painter.drawText(title_rect,Qt::AlignCenter, txt);
painter.drawText(title_rect,Qt::AlignHCenter | Qt::AlignBottom, txt);
//painter.drawRect(pixmap.rect().adjusted(0,0,-1,-1)); //painter.drawRect(pixmap.rect().adjusted(0,0,-1,-1));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

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

@ -119,16 +119,16 @@ void BRANCHES::calcFontData(void)
#else #else
pxCharWidth = metrics.width(QLatin1Char(ch)); pxCharWidth = metrics.width(QLatin1Char(ch));
#endif #endif
printf(" Width: %i\n", metrics.width(ch) ); //printf(" Width: %i\n", metrics.width(ch) );
printf(" Advance: %i\n", metrics.horizontalAdvance(ch) ); //printf(" Advance: %i\n", metrics.horizontalAdvance(ch) );
printf(" Left Bearing: %i\n", metrics.leftBearing(ch) ); //printf(" Left Bearing: %i\n", metrics.leftBearing(ch) );
printf("Right Bearing: %i\n", metrics.rightBearing(ch) ); //printf("Right Bearing: %i\n", metrics.rightBearing(ch) );
printf(" Ascent: %i\n", metrics.ascent() ); //printf(" Ascent: %i\n", metrics.ascent() );
printf(" Descent: %i\n", metrics.descent() ); //printf(" Descent: %i\n", metrics.descent() );
printf(" Height: %i\n", metrics.height() ); //printf(" Height: %i\n", metrics.height() );
printf(" Cap Height: %i\n", metrics.capHeight() ); //printf(" Cap Height: %i\n", metrics.capHeight() );
printf(" Line Spacing: %i\n", metrics.lineSpacing() ); //printf(" Line Spacing: %i\n", metrics.lineSpacing() );
printf(" Line Leading: %i\n", metrics.leading() ); //printf(" Line Leading: %i\n", metrics.leading() );
//for (int i=0; i<TOTAL_BOOKMARKS; i++) //for (int i=0; i<TOTAL_BOOKMARKS; i++)
//{ //{