From 93ee0efe3be647d81d10b0935bc9eafc38303e7a Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 9 Jan 2022 14:56:03 -0500 Subject: [PATCH] Minor vertical adjustments to Qt piano roll text placement. --- src/drivers/Qt/TasEditor/TasEditorWindow.cpp | 83 +++----------------- src/drivers/Qt/TasEditor/branches.cpp | 20 ++--- 2 files changed, 22 insertions(+), 81 deletions(-) diff --git a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp index 4f769c1d..1af6bd8a 100644 --- a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp +++ b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp @@ -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 ); 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->resize( iconSize ); @@ -6086,13 +6057,6 @@ void QPianoRoll::startDraggingMarker(int mouseX, int mouseY, int rowIndex, int c font.setItalic(false); 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 dragMode = DRAG_MODE_MARKER; 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(); update(); @@ -6397,7 +6332,8 @@ void QPianoRoll::paintEvent(QPaintEvent *event) //painter.drawText( x, pxLineTextOfs, tr("Frame#") ); 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); //painter.setFont(font); @@ -6666,12 +6602,14 @@ void QPianoRoll::paintEvent(QPaintEvent *event) if ( data & (0x01 << 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 ) { //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; } @@ -6705,7 +6643,8 @@ void QPianoRoll::paintEvent(QPaintEvent *event) } painter.setFont(font); //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() ) { @@ -6799,7 +6738,8 @@ void QPianoRoll::paintEvent(QPaintEvent *event) rect = QRect( x, 0, pxWidthBtnCol, pxLineSpacing ); painter.setPen( QPen(headerLightsColors[ headerColors[COLUMN_JOYPAD1_A + (i*8) + j] ],1) ); //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; } @@ -7524,7 +7464,8 @@ void markerDragPopup::paintEvent(QPaintEvent *event) //If the external theme color is set, you need to change it QRect title_rect{0,0,w,h}; 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)); } //---------------------------------------------------------------------------- diff --git a/src/drivers/Qt/TasEditor/branches.cpp b/src/drivers/Qt/TasEditor/branches.cpp index de8e82a6..c8960a70 100644 --- a/src/drivers/Qt/TasEditor/branches.cpp +++ b/src/drivers/Qt/TasEditor/branches.cpp @@ -119,16 +119,16 @@ void BRANCHES::calcFontData(void) #else pxCharWidth = metrics.width(QLatin1Char(ch)); #endif - printf(" Width: %i\n", metrics.width(ch) ); - printf(" Advance: %i\n", metrics.horizontalAdvance(ch) ); - printf(" Left Bearing: %i\n", metrics.leftBearing(ch) ); - printf("Right Bearing: %i\n", metrics.rightBearing(ch) ); - printf(" Ascent: %i\n", metrics.ascent() ); - printf(" Descent: %i\n", metrics.descent() ); - printf(" Height: %i\n", metrics.height() ); - printf(" Cap Height: %i\n", metrics.capHeight() ); - printf(" Line Spacing: %i\n", metrics.lineSpacing() ); - printf(" Line Leading: %i\n", metrics.leading() ); + //printf(" Width: %i\n", metrics.width(ch) ); + //printf(" Advance: %i\n", metrics.horizontalAdvance(ch) ); + //printf(" Left Bearing: %i\n", metrics.leftBearing(ch) ); + //printf("Right Bearing: %i\n", metrics.rightBearing(ch) ); + //printf(" Ascent: %i\n", metrics.ascent() ); + //printf(" Descent: %i\n", metrics.descent() ); + //printf(" Height: %i\n", metrics.height() ); + //printf(" Cap Height: %i\n", metrics.capHeight() ); + //printf(" Line Spacing: %i\n", metrics.lineSpacing() ); + //printf(" Line Leading: %i\n", metrics.leading() ); //for (int i=0; i