starmath/inc/edit.hxx | 3 ---
starmath/source/edit.cxx | 20 --------------------
2 files changed, 23 deletions(-)
New commits:
commit f3bb88b67b350900f60934e0f7bd550fa4fd47ec
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Apr 19 11:58:46 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Apr 19 16:54:35 2021 +0200
remove apparently no longer necessary scrollbar hide/show hack
before using weldeditview a revert of:
commit 67311738157bced7b49e94b24845091995edb142
Date: Thu Nov 7 02:53:09 2013 -0200
fdo#65588 - Elements Dock: Scrollbar moves into input window
and inserting multiple copies of the Taylor series rapidly shows
a glitch with the horizontal scrollbar as described in command #6
but after using weldeditview reverting this doesn't show the broken
behaviour so I'll drop this hackaround
Change-Id: I09e654cbd05b08d8e46fbf1986dbc4959687ea02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 3a77af082008..c89c23bd599e 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -136,9 +136,6 @@ public:
void SelPrevMark();
void DeleteEditView();
-
- void HideScrollbars();
- void ShowScrollbars();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 555e4d8442e3..a02ad7436500 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -828,18 +828,6 @@ void SmEditWindow::InsertText(const OUString& rText)
mxTextControl->InsertText(rText);
}
-void SmEditWindow::HideScrollbars()
-{
- mxScrolledWindow->set_vpolicy(VclPolicyType::NEVER);
- mxScrolledWindow->set_hpolicy(VclPolicyType::NEVER);
-}
-
-void SmEditWindow::ShowScrollbars()
-{
- mxScrolledWindow->set_vpolicy(VclPolicyType::ALWAYS);
- mxScrolledWindow->set_hpolicy(VclPolicyType::ALWAYS);
-}
-
void SmEditTextWindow::InsertText(const OUString& rText)
{
EditView* pEditView = GetEditView();
@@ -871,15 +859,7 @@ void SmEditTextWindow::InsertText(const OUString& rText)
if (aSelection.nStartPos > 0 && aCurrentFormula[nStartIndex - 1] != ' ')
string = " " + string;
- /*
- fdo#65588 - Elements Dock: Scrollbar moves into input window
- This change "solves" the visual problem. But I don't think so
- this is the best solution.
- */
- mrEditWindow.HideScrollbars();
pEditView->InsertText(string);
- mrEditWindow.AdjustScrollBars();
- mrEditWindow.ShowScrollbars();
// Remember start of the selection and move the cursor there afterwards.
aSelection.nEndPara = aSelection.nStartPara;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
