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 1d4533b57d Add and define graphic for unselected crosshair
1d4533b57d is described below
commit 1d4533b57d5957566d962e24a257e4417d531467
Author: mseidel <[email protected]>
AuthorDate: Sun Apr 2 12:25:33 2023 +0200
Add and define graphic for unselected crosshair
(cherry picked from commit 5198b0daf2835aed6a983c6117138174c2adb7a3)
---
main/default_images/svx/res/markers.png | Bin 3124 -> 3149 bytes
main/default_images/svx/res/markers2.png | Bin 7729 -> 7868 bytes
main/default_images/svx/res/markersACC.png | Bin 9004 -> 9160 bytes
.../classic/classic_images.tar.gz | Bin 1879476 -> 1879609
bytes
.../industrial/svx/res/markers2.png | Bin 10388 -> 10553 bytes
main/svx/inc/svx/svdhdl.hxx | 1 +
main/svx/source/svdraw/svdhdl.cxx | 23 ++++++++++++++-------
7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/main/default_images/svx/res/markers.png
b/main/default_images/svx/res/markers.png
index 69505c03a4..e352aed99c 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 e3bc5c3836..b2fe6722f9 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 7fc7351efb..1d76f36b58 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 52caa27235..9a2c8afd17 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 ba051d4a59..c6674fb449 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/svdhdl.hxx b/main/svx/inc/svx/svdhdl.hxx
index b2a0dddab2..e692b14ef1 100644
--- a/main/svx/inc/svx/svdhdl.hxx
+++ b/main/svx/inc/svx/svdhdl.hxx
@@ -130,6 +130,7 @@ enum BitmapMarkerKind
RectPlus_9x9,
RectPlus_11x11,
Crosshair,
+ Crosshair_Unselected,
Glue,
Glue_Unselected,
Anchor,
diff --git a/main/svx/source/svdraw/svdhdl.cxx
b/main/svx/source/svdraw/svdhdl.cxx
index 7c48c613f8..b07670719d 100644
--- a/main/svx/source/svdraw/svdhdl.cxx
+++ b/main/svx/source/svdraw/svdhdl.cxx
@@ -105,7 +105,7 @@ public:
SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
: maMarkersBitmap(ResId(nResId, *ImpGetResMgr())), // just use resource
with alpha channel
- // 14 kinds (BitmapMarkerKind) use index [0..5], 5 extra
+ // 14 kinds (BitmapMarkerKind) use index [0..5], 6 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
}
@@ -243,30 +243,35 @@ const BitmapEx&
SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
case Crosshair:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 0, Rectangle(Point(0, 68), Size(15, 15)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 0, Rectangle(Point(0, 66), Size(13, 13)));
+ }
+
+ case Crosshair_Unselected:
+ {
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 1, Rectangle(Point(0, 79), Size(13, 13)));
}
case Glue:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 1, Rectangle(Point(15, 74), Size(9, 9)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 2, Rectangle(Point(15, 74), Size(9, 9)));
}
case Glue_Unselected:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 2, Rectangle(Point(15, 83), Size(9, 9)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 3, Rectangle(Point(15, 83), Size(9, 9)));
}
case Anchor: // #101688# AnchorTR for SW
case AnchorTR:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 3, Rectangle(Point(24, 68), Size(24, 24)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 4, Rectangle(Point(24, 68), Size(24, 24)));
}
// #98388# add AnchorPressed to be able to animate anchor
control
case AnchorPressed:
case AnchorPressedTR:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 4, Rectangle(Point(48, 68), Size(24, 24)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 5, Rectangle(Point(48, 68), Size(24, 24)));
}
}
@@ -534,6 +539,10 @@ void SdrHdl::CreateB2dIAObject()
eKindOfMarker = Crosshair;
break;
}
+ {
+ eKindOfMarker = Crosshair_Unselected;
+ break;
+ }
case HDL_GLUE:
{
eKindOfMarker = Glue;
@@ -759,7 +768,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind
eKindOfMarker, sal_uInt16 nInd,
case RectPlus_11x11: eNextBigger =
Rect_13x13; break;
case Crosshair:
- eNextBigger = Glue;
+ eNextBigger = Crosshair_Unselected;
break;
case Glue:
