anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Attempt to align slider and buttons in a widget"

Browse Source 
This reverts commit ad44f4f448.
This commit is contained in:
Juergen Spitzmueller 2021-03-09 14:50:23 +01:00
parent ad44f4f448
commit dee329a21f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,9 +629,6 @@ GuiView::GuiView(int id)
QFontMetrics const fm(statusBar()->fontMetrics());
zoomwidget_ = new QWidget(statusBar());
zoomwidget_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
QHBoxLayout * zoomlayout = new QHBoxLayout(zoomwidget_);
zoom_slider_ = new QSlider(Qt::Horizontal, statusBar());
// Small size slider for macOS to prevent the status bar from enlarging
zoom_slider_->setAttribute(Qt::WA_MacSmallSize);
@ -664,11 +661,12 @@ GuiView::GuiView(int id)
zoom_out_->setFixedSize(QSize(fm.height(), fm.height()));
zoom_out_->setFlat(true);
zoomlayout->addWidget(zoom_out_);
zoomlayout->addWidget(zoom_slider_);
zoomlayout->addWidget(zoom_in_);
zoomwidget_->setEnabled(currentBufferView());
statusBar()->addPermanentWidget(zoomwidget_);
statusBar()->addPermanentWidget(zoom_out_);
zoom_out_->setEnabled(currentBufferView());
statusBar()->addPermanentWidget(zoom_slider_);
zoom_slider_->setEnabled(currentBufferView());
zoom_in_->setEnabled(currentBufferView());
statusBar()->addPermanentWidget(zoom_in_);
connect(zoom_slider_, SIGNAL(sliderMoved(int)), this, SLOT(zoomSliderMoved(int)));
connect(zoom_slider_, SIGNAL(valueChanged(int)), this, SLOT(zoomValueChanged(int)));
@ -1402,8 +1400,10 @@ void GuiView::onBufferViewChanged()
// Buffer-dependent dialogs must be updated. This is done here because
// some dialogs require buffer()->text.
updateDialogs();
zoomwidget_->setEnabled(currentBufferView());
zoom_slider_->setEnabled(currentBufferView());
zoom_value_->setEnabled(currentBufferView());
zoom_in_->setEnabled(currentBufferView());
zoom_out_->setEnabled(currentBufferView());
}

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

@ -29,7 +29,6 @@ class QPushButton;
class QLabel;
class QShowEvent;
class QSlider;
class QWidget;
namespace lyx {
@ -508,8 +507,6 @@ private:
QPushButton * zoom_in_;
/// Zoom out ("-") Button
QPushButton * zoom_out_;
/// The frame all slider elements are embedded in
QWidget * zoomwidget_;
/// The rate from which the actual zoom value is calculated
/// from the default zoom pref