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/03/08 15:24:27 UTC
[openoffice] branch AOO42X updated (bf6472255e -> e89feab640)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from bf6472255e Small updates to markers
new 3698e03b3c Make gluepoint more visible
new e89feab640 Small updates to markers
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/default_images/svx/res/markers2.png | Bin 7261 -> 7263 bytes
main/default_images/svx/res/markersACC.png | Bin 8830 -> 8829 bytes
.../source/sdr/primitive2d/sdrprimitivetools.cxx | 56 ++++++++++-----------
3 files changed, 28 insertions(+), 28 deletions(-)
[openoffice] 02/02: Small updates to markers
Posted by ms...@apache.org.
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
commit e89feab640219a2635b8c45da6d7fb3a76fc30e9
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Mar 8 16:18:43 2023 +0100
Small updates to markers
(cherry picked from commit 6329decab45aad4e32dbd43c15d581e556dee112)
---
main/default_images/svx/res/markers2.png | Bin 7261 -> 7263 bytes
main/default_images/svx/res/markersACC.png | Bin 8830 -> 8829 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/default_images/svx/res/markers2.png b/main/default_images/svx/res/markers2.png
index 4c980e735a..5e4ff3b6f4 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 0342adce40..7a5b2bbc24 100644
Binary files a/main/default_images/svx/res/markersACC.png and b/main/default_images/svx/res/markersACC.png differ
[openoffice] 01/02: Make gluepoint more visible
Posted by ms...@apache.org.
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
commit 3698e03b3c79fc5d70ee63a04881e190448a92bf
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Mar 8 16:17:26 2023 +0100
Make gluepoint more visible
(cherry picked from commit fb9aa39a6a9f09668247d499064dc47fc306b35c)
---
.../source/sdr/primitive2d/sdrprimitivetools.cxx | 56 +++++++++++-----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 1fbd24afd8..dbcc619809 100644
--- a/main/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/main/svx/source/sdr/primitive2d/sdrprimitivetools.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.
- *
+ *
*************************************************************/
@@ -38,7 +38,7 @@ namespace drawinglayer
{
static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0);
static basegfx::BColor aColor;
- ::osl::Mutex m_mutex;
+ ::osl::Mutex m_mutex;
if(!aRetVal.get() || rBColor != aColor)
{
@@ -56,7 +56,7 @@ namespace drawinglayer
const BitmapColor aMaskColor(0x01);
// Y,X unusual order (!)
- pWContent->SetPixel(0, 1, aPixColor);
+ pWContent->SetPixel(0, 1, aPixColor);
pWContent->SetPixel(1, 0, aPixColor);
pWContent->SetPixel(1, 1, aPixColor);
pWContent->SetPixel(1, 2, aPixColor);
@@ -77,12 +77,13 @@ 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)
{
static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0);
static basegfx::BColor aColorA;
static basegfx::BColor aColorB;
- ::osl::Mutex m_mutex;
+ ::osl::Mutex m_mutex;
if(!aRetVal.get() || rBColorA != aColorA || rBColorB != aColorB)
{
@@ -103,26 +104,46 @@ namespace drawinglayer
const BitmapColor aMaskColor(0x01);
// Y,X unusual order (!)
+ pWContent->SetPixel(0, 0, aPixColorA);
pWContent->SetPixel(0, 1, aPixColorA);
+ pWContent->SetPixel(0, 2, aPixColorA);
+ pWContent->SetPixel(0, 3, aPixColorA);
+ pWContent->SetPixel(0, 4, aPixColorA);
pWContent->SetPixel(0, 5, aPixColorA);
+ pWContent->SetPixel(0, 6, aPixColorA);
pWContent->SetPixel(1, 0, aPixColorA);
pWContent->SetPixel(1, 2, aPixColorA);
+ pWContent->SetPixel(1, 3, aPixColorA);
pWContent->SetPixel(1, 4, aPixColorA);
pWContent->SetPixel(1, 6, aPixColorA);
+ pWContent->SetPixel(2, 0, aPixColorA);
pWContent->SetPixel(2, 1, aPixColorA);
pWContent->SetPixel(2, 3, aPixColorA);
pWContent->SetPixel(2, 5, aPixColorA);
+ pWContent->SetPixel(2, 6, 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(4, 0, aPixColorA);
pWContent->SetPixel(4, 1, aPixColorA);
pWContent->SetPixel(4, 3, aPixColorA);
pWContent->SetPixel(4, 5, aPixColorA);
+ pWContent->SetPixel(4, 6, aPixColorA);
pWContent->SetPixel(5, 0, aPixColorA);
pWContent->SetPixel(5, 2, aPixColorA);
+ pWContent->SetPixel(5, 3, aPixColorA);
pWContent->SetPixel(5, 4, aPixColorA);
pWContent->SetPixel(5, 6, 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(1, 1, aPixColorB);
pWContent->SetPixel(1, 5, aPixColorB);
@@ -133,27 +154,6 @@ namespace drawinglayer
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);