icon-themes/galaxy/brand_cp/intro-highres.png |binary
icon-themes/galaxy/brand_cp/intro.png |binary
icon-themes/galaxy/brand_cp_snapshot/intro-highres.png |binary
icon-themes/galaxy/brand_cp_snapshot/intro.png |binary
instsetoo_native/CustomTarget_setup.mk | 10 +++++-----
sc/source/ui/app/inputwin.cxx | 12 ++++++++----
sc/source/ui/inc/inputwin.hxx | 1 +
7 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 779808a7c3fb4cc47aeb21ba5919f57caffee35b
Author: Pedro Pinto Silva <pedro.si...@collabora.com>
AuthorDate: Wed Apr 21 17:17:48 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 21 19:08:11 2021 +0200
[cp] Update splash screen
Change-Id: I661a9009dff0ad44b4c9bad3700c029f02631131
diff --git a/icon-themes/galaxy/brand_cp/intro-highres.png
b/icon-themes/galaxy/brand_cp/intro-highres.png
index 7891caaa8047..17724c32f2fa 100644
Binary files a/icon-themes/galaxy/brand_cp/intro-highres.png and
b/icon-themes/galaxy/brand_cp/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp/intro.png
b/icon-themes/galaxy/brand_cp/intro.png
index 7449b643cd95..4f0937b451e2 100644
Binary files a/icon-themes/galaxy/brand_cp/intro.png and
b/icon-themes/galaxy/brand_cp/intro.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png
b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png
index 87cf05397686..59a87dac1f96 100644
Binary files a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png and
b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro.png
b/icon-themes/galaxy/brand_cp_snapshot/intro.png
index fdfbda157a5f..2485dee83cfb 100644
Binary files a/icon-themes/galaxy/brand_cp_snapshot/intro.png and
b/icon-themes/galaxy/brand_cp_snapshot/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index e8c928d96fff..15802c36a754 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -135,11 +135,11 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'HideEula=1' \
&& echo 'Logo=1' \
&& echo 'NativeProgress=false' \
- && echo 'ProgressBarColor=0,0,0' \
- && echo 'ProgressFrameColor=102,102,102' \
- && echo 'ProgressPosition=26,235' \
- && echo 'ProgressSize=460,6' \
- && echo 'ProgressPositionHigh=46,212' \
+ && echo 'ProgressBarColor=80,73,153' \
+ && echo 'ProgressFrameColor=255,255,255' \
+ && echo 'ProgressPosition=268,106' \
+ && echo 'ProgressSize=212,4' \
+ && echo 'ProgressPositionHigh=268,137' \
&& echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=230' \
&& echo 'ProgressTextColor=255,255,255' \
commit 9749c327c54762c14062941874b773b40cf76448
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Apr 20 09:08:33 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Apr 21 19:08:11 2021 +0200
Fix early return in ScInputWindow::setPosSizePixel
change: Early return from ScInputWindow::setPosSizePixel() if no-op
0ad467d9abd27197bc5f7f22db5a25b3246e6808
was too agressive optimization causing input bar not
showing in the online and blocking the fix:
online: update calc inputbar position on change
09afa34955d76419ebe8f4d15780d801f95256ca
Sending message was originally introduced to update
information about position in the online when notebookbar
become visible (what causes input bar position change).
Send it only when vertical position changed.
Change-Id: Id7a231dabd20efe38094f31156f4f17f7d5a478e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114318
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index cfd01f1d962f..6c6fd824e8e6 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -159,7 +159,8 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const
SfxBindings* pBind ) :
mpViewShell ( nullptr ),
mnMaxY (0),
bIsOkCancelMode ( false ),
- bInResize ( false )
+ bInResize ( false ),
+ nOldOutOffYPixel( GetOutOffYPixel() )
{
// #i73615# don't rely on SfxViewShell::Current while constructing the
input line
// (also for GetInputHdl below)
@@ -476,11 +477,12 @@ void ScInputWindow::SetSizePixel( const Size& rNewSize )
void ScInputWindow::setPosSizePixel(tools::Long nX, tools::Long nY,
tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags)
{
- if ((!(nFlags & PosSizeFlags::Size) || GetSizePixel() == Size(nWidth,
nHeight)) &&
- (!(nFlags & PosSizeFlags::Pos) || GetPosPixel() == Point(nX, nY)))
+ ToolBox::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags);
+
+ // send update only when position changed eg. when notebookbar was opened
+ if (nOldOutOffYPixel == GetOutOffYPixel())
return;
- ToolBox::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags);
if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
{
std::vector<vcl::LOKPayloadItem> aItems;
@@ -489,6 +491,8 @@ void ScInputWindow::setPosSizePixel(tools::Long nX,
tools::Long nY, tools::Long
aItems.emplace_back("lines",
OString::number(mxTextWindow->GetNumLines()));
pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems);
}
+
+ nOldOutOffYPixel = GetOutOffYPixel();
}
void ScInputWindow::Resize()
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index db4da6e6b691..e8efe9187b82 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -352,6 +352,7 @@ private:
tools::Long mnMaxY;
bool bIsOkCancelMode;
bool bInResize;
+ long nOldOutOffYPixel;
};
class ScInputWindowWrapper : public SfxChildWindow
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
