[Libreoffice-commits] .: 2 commits - default_images/svx ooo_custom_images/hicontrast ooo_custom_images/industrial svx/inc svx/source
Michael Meeks
michael at kemper.freedesktop.org
Fri Nov 18 08:35:43 PST 2011
default_images/svx/res/cropmarkers.png |binary
default_images/svx/res/markers.png |binary
ooo_custom_images/hicontrast/svx/res/cropmarkers.png |binary
ooo_custom_images/hicontrast/svx/res/markers.png |binary
ooo_custom_images/industrial/cmd/lc_bezierappend.png |binary
ooo_custom_images/industrial/cmd/lc_bezierclose.png |binary
ooo_custom_images/industrial/cmd/lc_bezierconvert.png |binary
ooo_custom_images/industrial/cmd/lc_beziercutline.png |binary
ooo_custom_images/industrial/cmd/lc_bezierdelete.png |binary
ooo_custom_images/industrial/cmd/lc_bezieredge.png |binary
ooo_custom_images/industrial/cmd/lc_bezierinsert.png |binary
ooo_custom_images/industrial/cmd/lc_beziermove.png |binary
ooo_custom_images/industrial/cmd/lc_beziersmooth.png |binary
ooo_custom_images/industrial/cmd/lc_beziersymmetric.png |binary
ooo_custom_images/industrial/cmd/sc_bezierclose.png |binary
ooo_custom_images/industrial/cmd/sc_bezierconvert.png |binary
ooo_custom_images/industrial/cmd/sc_beziercutline.png |binary
ooo_custom_images/industrial/cmd/sc_bezierdelete.png |binary
ooo_custom_images/industrial/cmd/sc_bezieredge.png |binary
ooo_custom_images/industrial/cmd/sc_beziereliminatepoints.png |binary
ooo_custom_images/industrial/cmd/sc_bezierinsert.png |binary
ooo_custom_images/industrial/cmd/sc_beziermove.png |binary
ooo_custom_images/industrial/cmd/sc_beziersmooth.png |binary
ooo_custom_images/industrial/cmd/sc_beziersymmetric.png |binary
ooo_custom_images/industrial/svx/res/cd016.png |binary
ooo_custom_images/industrial/svx/res/cd017.png |binary
ooo_custom_images/industrial/svx/res/cd018.png |binary
ooo_custom_images/industrial/svx/res/cropmarkers.png |binary
ooo_custom_images/industrial/svx/res/id031.png |binary
ooo_custom_images/industrial/svx/res/id032.png |binary
ooo_custom_images/industrial/svx/res/id033.png |binary
ooo_custom_images/industrial/svx/res/markers.png |binary
svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx | 3
svx/inc/svx/svdhdl.hxx | 8
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 10 -
svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 89 ----------
svx/source/svdraw/svddrgmt.cxx | 5
svx/source/svdraw/svdhdl.cxx | 50 +++--
38 files changed, 39 insertions(+), 126 deletions(-)
New commits:
commit 8e95736e3a92292763ff7fe619bbd8de327c9c33
Author: Michael Meeks <michael.meeks at suse.com>
Date: Fri Nov 18 16:35:06 2011 +0000
Use new glue-point creation code, makes glue-points visible & themable
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 8bd35f2..feadaf9 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -48,9 +48,6 @@ 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
} // end of namespace drawinglayer
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index a9069ce..4dbde6d 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -151,8 +151,7 @@ class SVX_DLLPUBLIC SdrHdl
friend class SdrMarkView; // fuer den Zugriff auf nObjHdlNum
friend class SdrHdlList;
- // #101928#
- BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
+ static BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
protected:
SdrObject* pObj; // Gehoert das Handle zu einem Objekt?
@@ -254,6 +253,9 @@ public:
virtual void onMouseLeave();
bool isMouseOver() const;
+
+ static BitmapEx createGluePointBitmap() { return ImpGetBitmapEx(Glue_Deselected, 0); }
+
};
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 1d83ee3..c9cce9d 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -42,7 +42,7 @@
#include <svx/sdr/contact/objectcontactofpageview.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
+#include <svx/svdhdl.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -176,11 +176,9 @@ namespace sdr
if(!aGluepointVector.empty())
{
- const basegfx::BColor aBackPen(1.0, 1.0, 1.0);
- 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)));
+ const drawinglayer::primitive2d::Primitive2DReference xReference(
+ new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
+ aGluepointVector, SdrHdl::createGluePointBitmap()));
xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
}
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 38aadfe..8fb19ac 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -81,95 +81,6 @@ namespace drawinglayer
return aRetVal.get() ? *aRetVal.get() : BitmapEx();
}
-
- BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB)
- {
- static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0);
- static basegfx::BColor aColorA;
- static basegfx::BColor aColorB;
- ::osl::Mutex m_mutex;
-
- if(!aRetVal.get() || rBColorA != aColorA || rBColorB != aColorB)
- {
- // copy values
- aColorA = rBColorA;
- aColorB = rBColorB;
-
- // create bitmap
- Bitmap aContent(Size(7, 7), 24);
- Bitmap aMask(Size(7, 7), 1);
- BitmapWriteAccess* pWContent = aContent.AcquireWriteAccess();
- BitmapWriteAccess* pWMask = aMask.AcquireWriteAccess();
- OSL_ENSURE(pWContent && pWMask, "No WriteAccess to bitmap (!)");
- const Color aColA(aColorA);
- const Color aColB(aColorB);
- const BitmapColor aPixColorA(aColA);
- const BitmapColor aPixColorB(aColB);
- const BitmapColor aMaskColor(0x01);
-
- // Y,X unusual order (!)
- pWContent->SetPixel(0, 1, aPixColorA);
- pWContent->SetPixel(0, 5, aPixColorA);
- pWContent->SetPixel(1, 0, aPixColorA);
- pWContent->SetPixel(1, 2, aPixColorA);
- pWContent->SetPixel(1, 4, aPixColorA);
- pWContent->SetPixel(1, 6, aPixColorA);
- pWContent->SetPixel(2, 1, aPixColorA);
- pWContent->SetPixel(2, 3, aPixColorA);
- pWContent->SetPixel(2, 5, aPixColorA);
- pWContent->SetPixel(3, 2, aPixColorA);
- pWContent->SetPixel(3, 4, aPixColorA);
- pWContent->SetPixel(4, 1, aPixColorA);
- pWContent->SetPixel(4, 3, aPixColorA);
- pWContent->SetPixel(4, 5, aPixColorA);
- pWContent->SetPixel(5, 0, aPixColorA);
- pWContent->SetPixel(5, 2, aPixColorA);
- pWContent->SetPixel(5, 4, aPixColorA);
- pWContent->SetPixel(5, 6, aPixColorA);
- pWContent->SetPixel(6, 1, aPixColorA);
- pWContent->SetPixel(6, 5, aPixColorA);
-
- pWContent->SetPixel(1, 1, aPixColorB);
- pWContent->SetPixel(1, 5, aPixColorB);
- pWContent->SetPixel(2, 2, aPixColorB);
- pWContent->SetPixel(2, 4, aPixColorB);
- pWContent->SetPixel(3, 3, aPixColorB);
- pWContent->SetPixel(4, 2, aPixColorB);
- pWContent->SetPixel(4, 4, aPixColorB);
- pWContent->SetPixel(5, 1, aPixColorB);
- pWContent->SetPixel(5, 5, aPixColorB);
-
- pWMask->SetPixel(0, 0, aMaskColor);
- pWMask->SetPixel(0, 2, aMaskColor);
- pWMask->SetPixel(0, 3, aMaskColor);
- pWMask->SetPixel(0, 4, aMaskColor);
- pWMask->SetPixel(0, 6, aMaskColor);
- pWMask->SetPixel(1, 3, aMaskColor);
- pWMask->SetPixel(2, 0, aMaskColor);
- pWMask->SetPixel(2, 6, aMaskColor);
- pWMask->SetPixel(3, 0, aMaskColor);
- pWMask->SetPixel(3, 1, aMaskColor);
- pWMask->SetPixel(3, 5, aMaskColor);
- pWMask->SetPixel(3, 6, aMaskColor);
- pWMask->SetPixel(4, 0, aMaskColor);
- pWMask->SetPixel(4, 6, aMaskColor);
- pWMask->SetPixel(5, 3, aMaskColor);
- pWMask->SetPixel(6, 0, aMaskColor);
- pWMask->SetPixel(6, 2, aMaskColor);
- pWMask->SetPixel(6, 3, aMaskColor);
- pWMask->SetPixel(6, 4, aMaskColor);
- pWMask->SetPixel(6, 6, aMaskColor);
-
- aContent.ReleaseAccess(pWContent);
- aMask.ReleaseAccess(pWMask);
-
- // create and exchange at aRetVal
- delete aRetVal.set(new BitmapEx(aContent, aMask));
- }
-
- return aRetVal.get() ? *aRetVal.get() : BitmapEx();
- }
-
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3984e1d..34afa05 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -290,12 +290,9 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create
}
else
{
- const basegfx::BColor aBackPen(1.0, 1.0, 1.0);
- 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)));
-
+ SdrHdl::createGluePointBitmap()));
aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aMarkerArrayPrimitive2D, 1);
}
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 39c2af5..2cfb2cc 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -268,14 +268,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrHdlBitmapSet& getModernSet()
-{
- static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
- return *aModernSet.get();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SdrHdl::SdrHdl():
pObj(NULL),
pPV(NULL),
@@ -635,10 +627,10 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
return eRetval;
}
-// #101928#
BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
{
- return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
+ static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
+ return aModernSet.get()->GetBitmapEx(eKindOfMarker, nInd);
}
::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
commit b020f97590fe0ee8e4631e1e22b43a2f4700b1ba
Author: Aaron Strontsman <heinzlesspam at gmail.com>
Date: Thu Nov 10 13:17:48 2011 +0100
Some further changes to the (new) handles
diff --git a/default_images/svx/res/cropmarkers.png b/default_images/svx/res/cropmarkers.png
index c37736f..b73c914 100644
Binary files a/default_images/svx/res/cropmarkers.png and b/default_images/svx/res/cropmarkers.png differ
diff --git a/default_images/svx/res/markers.png b/default_images/svx/res/markers.png
index 0a69bbe..0d25820 100644
Binary files a/default_images/svx/res/markers.png and b/default_images/svx/res/markers.png differ
diff --git a/ooo_custom_images/hicontrast/svx/res/cropmarkers.png b/ooo_custom_images/hicontrast/svx/res/cropmarkers.png
index 6377043..b86d00a 100644
Binary files a/ooo_custom_images/hicontrast/svx/res/cropmarkers.png and b/ooo_custom_images/hicontrast/svx/res/cropmarkers.png differ
diff --git a/ooo_custom_images/hicontrast/svx/res/markers.png b/ooo_custom_images/hicontrast/svx/res/markers.png
index e521d74..112591d 100644
Binary files a/ooo_custom_images/hicontrast/svx/res/markers.png and b/ooo_custom_images/hicontrast/svx/res/markers.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bezierappend.png b/ooo_custom_images/industrial/cmd/lc_bezierappend.png
index d932b33..313eacb 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_bezierappend.png and b/ooo_custom_images/industrial/cmd/lc_bezierappend.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bezierclose.png b/ooo_custom_images/industrial/cmd/lc_bezierclose.png
index 5fb5d9f..e68622c 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_bezierclose.png and b/ooo_custom_images/industrial/cmd/lc_bezierclose.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bezierconvert.png b/ooo_custom_images/industrial/cmd/lc_bezierconvert.png
index 0149ff3..08a6a87 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_bezierconvert.png and b/ooo_custom_images/industrial/cmd/lc_bezierconvert.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_beziercutline.png b/ooo_custom_images/industrial/cmd/lc_beziercutline.png
index 644f8c8..d7de54b 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_beziercutline.png and b/ooo_custom_images/industrial/cmd/lc_beziercutline.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bezierdelete.png b/ooo_custom_images/industrial/cmd/lc_bezierdelete.png
index d291553..e7bc255 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_bezierdelete.png and b/ooo_custom_images/industrial/cmd/lc_bezierdelete.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bezieredge.png b/ooo_custom_images/industrial/cmd/lc_bezieredge.png
index 5e6c4d3..4a91504 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_bezieredge.png and b/ooo_custom_images/industrial/cmd/lc_bezieredge.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_bezierinsert.png b/ooo_custom_images/industrial/cmd/lc_bezierinsert.png
index c970fca..85f0f63 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_bezierinsert.png and b/ooo_custom_images/industrial/cmd/lc_bezierinsert.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_beziermove.png b/ooo_custom_images/industrial/cmd/lc_beziermove.png
index 52c0630..f7f0d06 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_beziermove.png and b/ooo_custom_images/industrial/cmd/lc_beziermove.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_beziersmooth.png b/ooo_custom_images/industrial/cmd/lc_beziersmooth.png
index 0fa22cc..460f1eb 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_beziersmooth.png and b/ooo_custom_images/industrial/cmd/lc_beziersmooth.png differ
diff --git a/ooo_custom_images/industrial/cmd/lc_beziersymmetric.png b/ooo_custom_images/industrial/cmd/lc_beziersymmetric.png
index 02118d8..e41a454 100644
Binary files a/ooo_custom_images/industrial/cmd/lc_beziersymmetric.png and b/ooo_custom_images/industrial/cmd/lc_beziersymmetric.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_bezierclose.png b/ooo_custom_images/industrial/cmd/sc_bezierclose.png
index e1828ec..e27db0c 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_bezierclose.png and b/ooo_custom_images/industrial/cmd/sc_bezierclose.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_bezierconvert.png b/ooo_custom_images/industrial/cmd/sc_bezierconvert.png
index 75c48a6..8f78216 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_bezierconvert.png and b/ooo_custom_images/industrial/cmd/sc_bezierconvert.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_beziercutline.png b/ooo_custom_images/industrial/cmd/sc_beziercutline.png
index be7c4a1..046af2f 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_beziercutline.png and b/ooo_custom_images/industrial/cmd/sc_beziercutline.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_bezierdelete.png b/ooo_custom_images/industrial/cmd/sc_bezierdelete.png
index b45f14f..253b6a9 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_bezierdelete.png and b/ooo_custom_images/industrial/cmd/sc_bezierdelete.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_bezieredge.png b/ooo_custom_images/industrial/cmd/sc_bezieredge.png
index 763f31a..c67beb8 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_bezieredge.png and b/ooo_custom_images/industrial/cmd/sc_bezieredge.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_beziereliminatepoints.png b/ooo_custom_images/industrial/cmd/sc_beziereliminatepoints.png
index 2600754..693b6d6 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_beziereliminatepoints.png and b/ooo_custom_images/industrial/cmd/sc_beziereliminatepoints.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_bezierinsert.png b/ooo_custom_images/industrial/cmd/sc_bezierinsert.png
index ced4ebb..9814063 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_bezierinsert.png and b/ooo_custom_images/industrial/cmd/sc_bezierinsert.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_beziermove.png b/ooo_custom_images/industrial/cmd/sc_beziermove.png
index 1b78b24..8eceb26 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_beziermove.png and b/ooo_custom_images/industrial/cmd/sc_beziermove.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_beziersmooth.png b/ooo_custom_images/industrial/cmd/sc_beziersmooth.png
index b1448d4..4e6bb30 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_beziersmooth.png and b/ooo_custom_images/industrial/cmd/sc_beziersmooth.png differ
diff --git a/ooo_custom_images/industrial/cmd/sc_beziersymmetric.png b/ooo_custom_images/industrial/cmd/sc_beziersymmetric.png
index 9b849d8..ff66bbb 100644
Binary files a/ooo_custom_images/industrial/cmd/sc_beziersymmetric.png and b/ooo_custom_images/industrial/cmd/sc_beziersymmetric.png differ
diff --git a/ooo_custom_images/industrial/svx/res/cd016.png b/ooo_custom_images/industrial/svx/res/cd016.png
index 1b78b24..d72b85e 100644
Binary files a/ooo_custom_images/industrial/svx/res/cd016.png and b/ooo_custom_images/industrial/svx/res/cd016.png differ
diff --git a/ooo_custom_images/industrial/svx/res/cd017.png b/ooo_custom_images/industrial/svx/res/cd017.png
index ced4ebb..afb0239 100644
Binary files a/ooo_custom_images/industrial/svx/res/cd017.png and b/ooo_custom_images/industrial/svx/res/cd017.png differ
diff --git a/ooo_custom_images/industrial/svx/res/cd018.png b/ooo_custom_images/industrial/svx/res/cd018.png
index 2825130..7fec1ea 100644
Binary files a/ooo_custom_images/industrial/svx/res/cd018.png and b/ooo_custom_images/industrial/svx/res/cd018.png differ
diff --git a/ooo_custom_images/industrial/svx/res/cropmarkers.png b/ooo_custom_images/industrial/svx/res/cropmarkers.png
index 0ded4fe..9b21b06 100644
Binary files a/ooo_custom_images/industrial/svx/res/cropmarkers.png and b/ooo_custom_images/industrial/svx/res/cropmarkers.png differ
diff --git a/ooo_custom_images/industrial/svx/res/id031.png b/ooo_custom_images/industrial/svx/res/id031.png
index 1b78b24..bdd1318 100644
Binary files a/ooo_custom_images/industrial/svx/res/id031.png and b/ooo_custom_images/industrial/svx/res/id031.png differ
diff --git a/ooo_custom_images/industrial/svx/res/id032.png b/ooo_custom_images/industrial/svx/res/id032.png
index ced4ebb..4ae9f03 100644
Binary files a/ooo_custom_images/industrial/svx/res/id032.png and b/ooo_custom_images/industrial/svx/res/id032.png differ
diff --git a/ooo_custom_images/industrial/svx/res/id033.png b/ooo_custom_images/industrial/svx/res/id033.png
index 2825130..e720114 100644
Binary files a/ooo_custom_images/industrial/svx/res/id033.png and b/ooo_custom_images/industrial/svx/res/id033.png differ
diff --git a/ooo_custom_images/industrial/svx/res/markers.png b/ooo_custom_images/industrial/svx/res/markers.png
index 6240dc3..4411148 100644
Binary files a/ooo_custom_images/industrial/svx/res/markers.png and b/ooo_custom_images/industrial/svx/res/markers.png differ
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 91a067a..a9069ce 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -84,6 +84,7 @@ enum SdrHdlKind
HDL_REF2, // Referenzpunkt 2, z.B. Endpunkt der Spiegelachse
HDL_MIRX, // Die Spiegelachse selbst
HDL_GLUE, // GluePoint
+ HDL_GLUE_DESELECTED, // GluePoint
HDL_ANCHOR, // anchor symbol (SD, SW)
HDL_TRNS, // interactive transparence
HDL_GRAD, // interactive gradient
@@ -129,6 +130,7 @@ enum BitmapMarkerKind
RectPlus_11x11,
Crosshair,
Glue,
+ Glue_Deselected,
Anchor,
// #98388# add AnchorPressed to be able to aninate anchor control, too.
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 75146b8..39c2af5 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -168,15 +168,15 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
}
case 2:
{
- return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(72, 78), Size(13, 13)));
+ return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(72, 79), Size(13, 13)));
}
case 3:
{
- return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(85, 78), Size(13, 13)));
+ return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(85, 79), Size(13, 13)));
}
case 4:
{
- return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(98, 78), Size(13, 13)));
+ return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(98, 79), Size(13, 13)));
}
default: // case 5:
{
@@ -243,20 +243,25 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
case Glue:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1, Rectangle(Point(15, 74), Size(9, 9)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1, Rectangle(Point(15, 76), Size(9, 9)));
+ }
+
+ case Glue_Deselected:
+ {
+ return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1, Rectangle(Point(15, 67), Size(9, 9)));
}
case Anchor: // #101688# AnchorTR for SW
case AnchorTR:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, Rectangle(Point(24, 68), Size(24, 23)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, Rectangle(Point(24, 67), Size(24, 24)));
}
// #98388# add AnchorPressed to be able to aninate anchor control
case AnchorPressed:
case AnchorPressedTR:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, Rectangle(Point(48, 68), Size(24, 23)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, Rectangle(Point(48, 67), Size(24, 24)));
}
}
}
@@ -514,6 +519,11 @@ void SdrHdl::CreateB2dIAObject()
eKindOfMarker = Glue;
break;
}
+ case HDL_GLUE_DESELECTED:
+ {
+ eKindOfMarker = Glue_Deselected;
+ break;
+ }
case HDL_ANCHOR:
{
eKindOfMarker = Anchor;
@@ -675,6 +685,9 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
case Glue:
eNextBigger = Crosshair;
break;
+ case Glue_Deselected:
+ eNextBigger = Glue;
+ break;
default:
break;
}
@@ -825,6 +838,7 @@ Pointer SdrHdl::GetPointer() const
case HDL_REF2 : ePtr=POINTER_REFHAND; break;
case HDL_BWGT : ePtr=POINTER_MOVEBEZIERWEIGHT; break;
case HDL_GLUE : ePtr=POINTER_MOVEPOINT; break;
+ case HDL_GLUE_DESELECTED : ePtr=POINTER_MOVEPOINT; break;
case HDL_CUSTOMSHAPE1 : ePtr=POINTER_HAND; break;
default:
break;
@@ -863,7 +877,7 @@ sal_Bool SdrHdl::IsFocusHdl() const
case HDL_REF2: // Referenzpunkt 2, z.B. Endpunkt der Spiegelachse
//case HDL_MIRX: // Die Spiegelachse selbst
case HDL_GLUE: // GluePoint
-
+ case HDL_GLUE_DESELECTED: // formerly a little blue cross
// #98388# do NOT activate here, let SW implement their own SdrHdl and
// overload IsFocusHdl() there to make the anchor accessible
//case HDL_ANCHOR: // anchor symbol (SD, SW)
@@ -1687,11 +1701,11 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
if (eKind1!=eKind2)
{
if (eKind1==HDL_REF1 || eKind1==HDL_REF2 || eKind1==HDL_MIRX) n1=5;
- else if (eKind1==HDL_GLUE) n1=2;
+ else if (eKind1==HDL_GLUE || eKind1==HDL_GLUE_DESELECTED) n1=2;
else if (eKind1==HDL_USER) n1=3;
else if (eKind1==HDL_SMARTTAG) n1=0;
if (eKind2==HDL_REF1 || eKind2==HDL_REF2 || eKind2==HDL_MIRX) n2=5;
- else if (eKind2==HDL_GLUE) n2=2;
+ else if (eKind2==HDL_GLUE || eKind2==HDL_GLUE_DESELECTED) n2=2;
else if (eKind2==HDL_USER) n2=3;
else if (eKind2==HDL_SMARTTAG) n2=0;
}
@@ -2222,12 +2236,12 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
else if( nSize <=4 )
{
nPixelSize = 17;
- nOffset = 36;
+ nOffset = 39;
}
else
{
nPixelSize = 21;
- nOffset = 84;
+ nOffset = 90;
}
switch( eKind )
@@ -2243,7 +2257,7 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
default: break;
}
- Rectangle aSourceRect( Point( nX * (nPixelSize-1) + nOffset, nY * (nPixelSize-1)), Size(nPixelSize, nPixelSize) );
+ Rectangle aSourceRect( Point( nX * (nPixelSize) + nOffset, nY * (nPixelSize)), Size(nPixelSize, nPixelSize) );
BitmapEx aRetval(rBitmap);
aRetval.Crop(aSourceRect);
More information about the Libreoffice-commits
mailing list