You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/04/04 16:29:38 UTC
[openoffice] branch AOO42X updated: Resize glue point to 9x9, updated graphics for handles
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 953ac05424 Resize glue point to 9x9, updated graphics for handles
953ac05424 is described below
commit 953ac05424c981e71edf89d3d31a4aa3b072b1ed
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Apr 4 18:21:01 2023 +0200
Resize glue point to 9x9, updated graphics for handles
(cherry picked from commit 4e278df9e5e1ce775b1c944fc931d3141551160a)
---
main/default_images/svx/res/markers.png | Bin 3149 -> 3179 bytes
main/default_images/svx/res/markers2.png | Bin 7868 -> 8555 bytes
main/default_images/svx/res/markersACC.png | Bin 9160 -> 9881 bytes
.../classic/classic_images.tar.gz | Bin 1879609 -> 1879668 bytes
.../industrial/svx/res/markers2.png | Bin 10553 -> 11377 bytes
.../inc/svx/sdr/primitive2d/sdrprimitivetools.hxx | 18 +++----
.../svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2 +-
.../source/sdr/primitive2d/sdrprimitivetools.cxx | 58 ++++++++++++++++-----
main/svx/source/svdraw/svddrgmt.cxx | 10 ++--
main/svx/source/svdraw/svdhdl.cxx | 4 +-
10 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/main/default_images/svx/res/markers.png b/main/default_images/svx/res/markers.png
index e352aed99c..5124b392f4 100644
Binary files a/main/default_images/svx/res/markers.png and b/main/default_images/svx/res/markers.png differ
diff --git a/main/default_images/svx/res/markers2.png b/main/default_images/svx/res/markers2.png
index b2fe6722f9..d62108e1b8 100644
Binary files a/main/default_images/svx/res/markers2.png and b/main/default_images/svx/res/markers2.png differ
diff --git a/main/default_images/svx/res/markersACC.png b/main/default_images/svx/res/markersACC.png
index 1d76f36b58..d8cb8ca14c 100644
Binary files a/main/default_images/svx/res/markersACC.png and b/main/default_images/svx/res/markersACC.png differ
diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz
index 9a2c8afd17..128a4f0e1a 100644
Binary files a/main/ooo_custom_images/classic/classic_images.tar.gz and b/main/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/main/ooo_custom_images/industrial/svx/res/markers2.png b/main/ooo_custom_images/industrial/svx/res/markers2.png
index c6674fb449..96c7072432 100644
Binary files a/main/ooo_custom_images/industrial/svx/res/markers2.png and b/main/ooo_custom_images/industrial/svx/res/markers2.png differ
diff --git a/main/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/main/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 3b0fa18602..ff2be85f77 100644
--- a/main/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/main/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -30,8 +30,8 @@
//////////////////////////////////////////////////////////////////////////////
// predefines
-namespace basegfx {
- class BColor;
+namespace basegfx {
+ class BColor;
}
//////////////////////////////////////////////////////////////////////////////
@@ -44,9 +44,9 @@ namespace drawinglayer
// create a 3x3 cross in given color as BitmapEx
BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor);
- // create a 7x7 gluepoint symbol in given colors as BitmapEx
- BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB);
- } // end of namespace primitive2d
+ // create a 9x9 gluepoint symbol in given colors as BitmapEx
+ BitmapEx createDefaultGluepoint_9x9(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB);
+ } // end of namespace primitive2d
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
diff --git a/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index ae7df4ffd0..04793a5d67 100644
--- a/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -176,7 +176,7 @@ namespace sdr
const basegfx::BColor aRGBFrontColor(0.0, 0.0, 1.0); // COL_LIGHTBLUE
const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
aGluepointVector,
- drawinglayer::primitive2d::createDefaultGluepoint_7x7(aBackPen, aRGBFrontColor)));
+ drawinglayer::primitive2d::createDefaultGluepoint_9x9(aBackPen, aRGBFrontColor)));
xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
}
diff --git a/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index dbcc619809..c5ca0192b7 100644
--- a/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -77,8 +77,8 @@ namespace drawinglayer
return aRetVal.get() ? *aRetVal.get() : BitmapEx();
}
-// TODO: Move this bitmap to markers*.png, so it will be part of the icon theme
- BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB)
+// TODO: Use the bitmap (Glue_Unselected) from markers*.png, so it will be part of the icon theme
+ BitmapEx createDefaultGluepoint_9x9(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB)
{
static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0);
static basegfx::BColor aColorA;
@@ -92,8 +92,8 @@ namespace drawinglayer
aColorB = rBColorB;
// create bitmap
- Bitmap aContent(Size(7, 7), 24);
- Bitmap aMask(Size(7, 7), 1);
+ Bitmap aContent(Size(9, 9), 24);
+ Bitmap aMask(Size(9, 9), 1);
BitmapWriteAccess* pWContent = aContent.AcquireWriteAccess();
BitmapWriteAccess* pWMask = aMask.AcquireWriteAccess();
OSL_ENSURE(pWContent && pWMask, "No WriteAccess to bitmap (!)");
@@ -111,49 +111,81 @@ namespace drawinglayer
pWContent->SetPixel(0, 4, aPixColorA);
pWContent->SetPixel(0, 5, aPixColorA);
pWContent->SetPixel(0, 6, aPixColorA);
+ pWContent->SetPixel(0, 7, aPixColorA);
+ pWContent->SetPixel(0, 8, aPixColorA);
pWContent->SetPixel(1, 0, aPixColorA);
pWContent->SetPixel(1, 2, aPixColorA);
pWContent->SetPixel(1, 3, aPixColorA);
pWContent->SetPixel(1, 4, aPixColorA);
+ pWContent->SetPixel(1, 5, aPixColorA);
pWContent->SetPixel(1, 6, aPixColorA);
+ pWContent->SetPixel(1, 8, aPixColorA);
pWContent->SetPixel(2, 0, aPixColorA);
pWContent->SetPixel(2, 1, aPixColorA);
pWContent->SetPixel(2, 3, aPixColorA);
+ pWContent->SetPixel(2, 4, aPixColorA);
pWContent->SetPixel(2, 5, aPixColorA);
- pWContent->SetPixel(2, 6, aPixColorA);
+ pWContent->SetPixel(2, 7, aPixColorA);
+ pWContent->SetPixel(2, 8, aPixColorA);
pWContent->SetPixel(3, 0, aPixColorA);
pWContent->SetPixel(3, 1, aPixColorA);
pWContent->SetPixel(3, 2, aPixColorA);
pWContent->SetPixel(3, 4, aPixColorA);
- pWContent->SetPixel(3, 5, aPixColorA);
pWContent->SetPixel(3, 6, aPixColorA);
+ pWContent->SetPixel(3, 7, aPixColorA);
+ pWContent->SetPixel(3, 8, aPixColorA);
pWContent->SetPixel(4, 0, aPixColorA);
pWContent->SetPixel(4, 1, aPixColorA);
+ pWContent->SetPixel(4, 2, aPixColorA);
pWContent->SetPixel(4, 3, aPixColorA);
pWContent->SetPixel(4, 5, aPixColorA);
pWContent->SetPixel(4, 6, aPixColorA);
+ pWContent->SetPixel(4, 7, aPixColorA);
+ pWContent->SetPixel(4, 8, aPixColorA);
pWContent->SetPixel(5, 0, aPixColorA);
+ pWContent->SetPixel(5, 1, aPixColorA);
pWContent->SetPixel(5, 2, aPixColorA);
- pWContent->SetPixel(5, 3, aPixColorA);
pWContent->SetPixel(5, 4, aPixColorA);
pWContent->SetPixel(5, 6, aPixColorA);
+ pWContent->SetPixel(5, 7, aPixColorA);
+ pWContent->SetPixel(5, 8, aPixColorA);
pWContent->SetPixel(6, 0, aPixColorA);
pWContent->SetPixel(6, 1, aPixColorA);
- pWContent->SetPixel(6, 2, aPixColorA);
pWContent->SetPixel(6, 3, aPixColorA);
pWContent->SetPixel(6, 4, aPixColorA);
pWContent->SetPixel(6, 5, aPixColorA);
- pWContent->SetPixel(6, 6, aPixColorA);
+ pWContent->SetPixel(6, 7, aPixColorA);
+ pWContent->SetPixel(6, 8, aPixColorA);
+ pWContent->SetPixel(7, 0, aPixColorA);
+ pWContent->SetPixel(7, 2, aPixColorA);
+ pWContent->SetPixel(7, 3, aPixColorA);
+ pWContent->SetPixel(7, 4, aPixColorA);
+ pWContent->SetPixel(7, 5, aPixColorA);
+ pWContent->SetPixel(7, 6, aPixColorA);
+ pWContent->SetPixel(7, 8, aPixColorA);
+ pWContent->SetPixel(8, 0, aPixColorA);
+ pWContent->SetPixel(8, 1, aPixColorA);
+ pWContent->SetPixel(8, 2, aPixColorA);
+ pWContent->SetPixel(8, 3, aPixColorA);
+ pWContent->SetPixel(8, 4, aPixColorA);
+ pWContent->SetPixel(8, 5, aPixColorA);
+ pWContent->SetPixel(8, 6, aPixColorA);
+ pWContent->SetPixel(8, 7, aPixColorA);
+ pWContent->SetPixel(8, 8, aPixColorA);
pWContent->SetPixel(1, 1, aPixColorB);
- pWContent->SetPixel(1, 5, aPixColorB);
+ pWContent->SetPixel(1, 7, aPixColorB);
pWContent->SetPixel(2, 2, aPixColorB);
- pWContent->SetPixel(2, 4, aPixColorB);
+ pWContent->SetPixel(2, 6, aPixColorB);
pWContent->SetPixel(3, 3, aPixColorB);
- pWContent->SetPixel(4, 2, aPixColorB);
+ pWContent->SetPixel(3, 5, aPixColorB);
pWContent->SetPixel(4, 4, aPixColorB);
- pWContent->SetPixel(5, 1, aPixColorB);
+ pWContent->SetPixel(5, 3, aPixColorB);
pWContent->SetPixel(5, 5, aPixColorB);
+ pWContent->SetPixel(6, 2, aPixColorB);
+ pWContent->SetPixel(6, 6, aPixColorB);
+ pWContent->SetPixel(7, 1, aPixColorB);
+ pWContent->SetPixel(7, 7, aPixColorB);
aContent.ReleaseAccess(pWContent);
aMask.ReleaseAccess(pWMask);
diff --git a/main/svx/source/svdraw/svddrgmt.cxx b/main/svx/source/svdraw/svddrgmt.cxx
index ed2090bd18..c12776edf1 100644
--- a/main/svx/source/svdraw/svddrgmt.cxx
+++ b/main/svx/source/svdraw/svddrgmt.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -309,7 +309,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create
const basegfx::BColor aRGBFrontColor(0.0, 0.0, 1.0); // COL_LIGHTBLUE
drawinglayer::primitive2d::Primitive2DReference aMarkerArrayPrimitive2D(
new drawinglayer::primitive2d::MarkerArrayPrimitive2D(aTransformedPositions,
- drawinglayer::primitive2d::createDefaultGluepoint_7x7(aBackPen, aRGBFrontColor)));
+ drawinglayer::primitive2d::createDefaultGluepoint_9x9(aBackPen, aRGBFrontColor)));
aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aMarkerArrayPrimitive2D, 1);
}
diff --git a/main/svx/source/svdraw/svdhdl.cxx b/main/svx/source/svdraw/svdhdl.cxx
index fa8c5d456e..1a1bcb14d8 100644
--- a/main/svx/source/svdraw/svdhdl.cxx
+++ b/main/svx/source/svdraw/svdhdl.cxx
@@ -253,12 +253,12 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
case Glue:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, Rectangle(Point(15, 74), Size(9, 9)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, Rectangle(Point(13, 70), Size(11, 11)));
}
case Glue_Unselected:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, Rectangle(Point(15, 83), Size(9, 9)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, Rectangle(Point(13, 81), Size(11, 11)));
}
case Anchor: // #101688# AnchorTR for SW