diff options
author | Pranam Lashkari <lpranam@collabora.com> | 2020-04-29 00:20:12 +0530 |
---|---|---|
committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2020-05-05 11:53:26 +0200 |
commit | 756bbe3f94fe1736406b7fd16ce62a67e7e62769 (patch) | |
tree | 3b724ff3586d491ebc74cf2fbf49a9070dc82997 | |
parent | setuprc has to be a .PHONY target in order to get the current git hash (diff) | |
download | core-756bbe3f94fe1736406b7fd16ce62a67e7e62769.tar.gz core-756bbe3f94fe1736406b7fd16ce62a67e7e62769.zip |
tdf#131230: Sidebar: Can't set Automatic color
This also solved the issue in sidebar with some controls
when selecting an item it selects the item below
Change-Id: I607b8bc44402b57b5c4833f918fb41b23ddf48c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93099
Tested-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
-rw-r--r-- | desktop/source/lib/init.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index c735451b8e0c..7c3a86ca5878 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3830,9 +3830,8 @@ static void doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned return; } - Size aOffset(pWindow->GetOutOffXPixel(), pWindow->GetOutOffYPixel()); - Point aPos(nX, nY); - aPos.Move(aOffset); + const Point aPos(nX, nY); + MouseEvent aEvent(aPos, nCount, MouseEventModifiers::SIMPLECLICK, nButtons, nModifier); if (Dialog* pDialog = dynamic_cast<Dialog*>(pWindow.get())) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 1d1963feb61a..a8ecde9b214b 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -576,7 +576,7 @@ void ScInputWindow::NotifyLOKClient() { std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back("type", "calc-input-win"); - aItems.emplace_back(std::make_pair("position", Point(0, 0).toString())); + aItems.emplace_back(std::make_pair("position", Point(GetOutOffXPixel(), GetOutOffYPixel()).toString())); aItems.emplace_back(std::make_pair("size", aSize.toString())); aItems.emplace_back("lines", OString::number(aTextWindow.GetNumLines())); pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); |