From 49e622ac0fe937fedb49b1014641bc51de5704a9 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 30 Mar 2022 20:36:24 -0700 Subject: [PATCH] viewertexteditor: shifted code to class [skip ci] Minor code organization --- app/widget/viewer/viewerdisplay.cpp | 2 -- app/widget/viewer/viewertexteditor.cpp | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp index d90dffeba..7914763a9 100644 --- a/app/widget/viewer/viewerdisplay.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -344,8 +344,6 @@ void ViewerDisplayWidget::mouseDoubleClickEvent(QMouseEvent *event) text_edit->setGeometry(transformed_geom.toRect()); ViewerTextEditorToolBar *toolbar = new ViewerTextEditorToolBar(this); - toolbar->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint); - toolbar->resize(toolbar->sizeHint()); QPoint pos = mapToGlobal(QPoint(transformed_geom.x(), transformed_geom.y() - toolbar->height())); for (QScreen *screen : qApp->screens()) { diff --git a/app/widget/viewer/viewertexteditor.cpp b/app/widget/viewer/viewertexteditor.cpp index 7eeab3787..a3480a67c 100644 --- a/app/widget/viewer/viewertexteditor.cpp +++ b/app/widget/viewer/viewertexteditor.cpp @@ -321,7 +321,7 @@ void ViewerTextEditor::DocumentChanged() } ViewerTextEditorToolBar::ViewerTextEditorToolBar(QWidget *parent) : - QWidget(parent), + QWidget(parent, Qt::Tool | Qt::FramelessWindowHint), painted_(false) { QVBoxLayout *outer_layout = new QVBoxLayout(this); @@ -449,6 +449,8 @@ ViewerTextEditorToolBar::ViewerTextEditorToolBar(QWidget *parent) : advanced_layout->addStretch(); setAutoFillBackground(true); + + resize(sizeHint()); } void ViewerTextEditorToolBar::SetAlignment(Qt::Alignment a)