Merge pull request #21826 from 3x380V/fix_21812
Spreadsheet: Re-enable zooming and fix cursor change
This commit is contained in:
@@ -37,7 +37,6 @@ DlgSettingsImp::DlgSettingsImp(QWidget* parent)
|
||||
, ui(new Ui_DlgSettings)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->dZLSpinBox->setDisabled(true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -72,6 +72,7 @@ void SheetViewHeader::mouseMoveEvent(QMouseEvent* e)
|
||||
void SheetViewHeader::mouseReleaseEvent(QMouseEvent* event)
|
||||
{
|
||||
QHeaderView::mouseReleaseEvent(event);
|
||||
qApp->setOverrideCursor(Qt::ArrowCursor);
|
||||
Q_EMIT resizeFinished();
|
||||
}
|
||||
|
||||
|
||||
@@ -74,15 +74,9 @@ SheetView::SheetView(Gui::Document* pcDocument, App::DocumentObject* docObj, QWi
|
||||
ui = new Ui::Sheet();
|
||||
QWidget* w = new QWidget(this);
|
||||
ui->setupUi(w);
|
||||
ui->zoomMinus->hide();
|
||||
ui->zoomPlus->hide();
|
||||
ui->zoomSlider->hide();
|
||||
ui->zoomTB->hide();
|
||||
ui->realSB_h->hide();
|
||||
ui->realSB_v->hide();
|
||||
setCentralWidget(w);
|
||||
|
||||
// new ZoomableView(ui);
|
||||
new ZoomableView(ui);
|
||||
|
||||
delegate = new SpreadsheetDelegate(sheet);
|
||||
ui->cells->setModel(model);
|
||||
|
||||
Reference in New Issue
Block a user