anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use labels for zoom slider buttons

Browse Source 
Fix for bug #12301.

Also: fixes the width and alignment of the zoom value label.
This commit is contained in:
Daniel Ramoeller 2021-11-02 08:08:29 +01:00 committed by Juergen Spitzmueller
parent 4643048583
commit 59b8c209c4
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt/GuiClickableLabel.cpp
View File

@ -11,6 +11,8 @@
#include "GuiClickableLabel.h"
#include <QStyle>
namespace lyx {
namespace frontend {
@ -22,8 +24,8 @@ GuiClickableLabel::~GuiClickableLabel()
{}
void GuiClickableLabel::mouseReleaseEvent(QMouseEvent *) {
Q_EMIT clicked();
}
Q_EMIT clicked();
}
}
}

22
src/frontends/qt/GuiView.cpp
View File

@ -648,14 +648,15 @@ GuiView::GuiView(int id)
zoom_slider_->setToolTip(qt_("Workarea zoom level. Drag, use Ctrl-+/- or Shift-Mousewheel to adjust."));
// Buttons to change zoom stepwise
zoom_in_ = new QPushButton(statusBar());
QSize s(fm.width('+'), fm.height());
zoom_in_ = new GuiClickableLabel(statusBar());
zoom_in_->setText("+");
zoom_in_->setFlat(true);
zoom_in_->setFixedSize(QSize(fm.height(), fm.height()));
zoom_out_ = new QPushButton(statusBar());
zoom_in_->setFixedSize(s);
zoom_in_->setAlignment(Qt::AlignCenter);
zoom_out_ = new GuiClickableLabel(statusBar());
zoom_out_->setText(QString(QChar(0x2212)));
zoom_out_->setFixedSize(QSize(fm.height(), fm.height()));
zoom_out_->setFlat(true);
zoom_out_->setFixedSize(s);
zoom_out_->setAlignment(Qt::AlignCenter);
statusBar()->addPermanentWidget(zoom_out_);
zoom_out_->setEnabled(currentBufferView());
@ -670,13 +671,18 @@ GuiView::GuiView(int id)
connect(zoom_in_, SIGNAL(clicked()), this, SLOT(zoomInPressed()));
connect(zoom_out_, SIGNAL(clicked()), this, SLOT(zoomOutPressed()));
// QPalette palette = statusBar()->palette();
zoom_value_ = new QLabel(statusBar());
// zoom_value_->setPalette(palette);
zoom_value_->setForegroundRole(statusBar()->foregroundRole());
zoom_value_->setFixedHeight(fm.height());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
zoom_value_->setMinimumWidth(fm.horizontalAdvance("000%"));
zoom_value_->setMinimumWidth(fm.horizontalAdvance("444\%"));
#else
zoom_value_->setMinimumWidth(fm.width("000%"));
zoom_value_->setMinimumWidth(fm.width("444\%"));
#endif
zoom_value_->setAlignment(Qt::AlignCenter);
zoom_value_->setText(toqstr(bformat(_("[[ZOOM]]%1$d%"), zoom)));
statusBar()->addPermanentWidget(zoom_value_);
zoom_value_->setEnabled(currentBufferView());

7
src/frontends/qt/GuiView.h
View File

@ -20,6 +20,7 @@
#include "support/strfwd.h"
#include <QMainWindow>
#include <QLabel>
#include <QMenu>
#include <QSvgWidget>
@ -27,7 +28,6 @@ class QCloseEvent;
class QDragEnterEvent;
class QDropEvent;
class QPushButton;
class QLabel;
class QShowEvent;
class QSlider;
@ -48,6 +48,7 @@ namespace frontend {
class Dialog;
class LayoutBox;
class GuiClickableLabel;
class GuiToolbar;
class GuiWorkArea;
class TabWorkArea;
@ -510,9 +511,9 @@ private:
/// The zoom slider widget
QSlider * zoom_slider_;
/// Zoom in ("+") Button
QPushButton * zoom_in_;
GuiClickableLabel * zoom_in_;
/// Zoom out ("-") Button
QPushButton * zoom_out_;
GuiClickableLabel * zoom_out_;
/// The rate from which the actual zoom value is calculated
/// from the default zoom pref