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/08/12 11:09:04 UTC

[openoffice] branch trunk updated: Small modifications

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 47f0deb880 Small modifications
47f0deb880 is described below

commit 47f0deb880e805ca248abf7acab938bf2af73088
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Aug 12 13:08:44 2023 +0200

    Small modifications
---
 .../sd/res/slide_sorter_insert_shadow.png          | Bin 539 -> 140 bytes
 .../ui/slidesorter/cache/SlsBitmapFactory.cxx      |  57 ++++++++++-----------
 .../view/SlsInsertionIndicatorOverlay.cxx          |  10 ++--
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/main/default_images/sd/res/slide_sorter_insert_shadow.png b/main/default_images/sd/res/slide_sorter_insert_shadow.png
index a95ea8721b..a7ac1fb9c2 100644
Binary files a/main/default_images/sd/res/slide_sorter_insert_shadow.png and b/main/default_images/sd/res/slide_sorter_insert_shadow.png differ
diff --git a/main/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/main/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
index aef8a46a8b..d6e15f57cc 100644
--- a/main/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx
+++ b/main/sd/source/ui/slidesorter/cache/SlsBitmapFactory.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.
- * 
+ *
  *************************************************************/
 
 
@@ -49,7 +49,7 @@ class PageObjectViewObjectContact;
 namespace sd { namespace slidesorter { namespace cache {
 
 BitmapFactory::BitmapFactory (void)
-    : maRenderer(NULL, false)
+	: maRenderer(NULL, false)
 {
 }
 
@@ -64,33 +64,32 @@ BitmapFactory::~BitmapFactory (void)
 
 
 Bitmap BitmapFactory::CreateBitmap (
-    const SdPage& rPage,
-    const Size& rPixelSize,
-    const bool bDoSuperSampling)
+	const SdPage& rPage,
+	const Size& rPixelSize,
+	const bool bDoSuperSampling)
 {
-    Size aSize (rPixelSize);
-    if (bDoSuperSampling && gbAllowSuperSampling)
-    {
-        aSize.Width() *= gnSuperSampleFactor;
-        aSize.Height() *= gnSuperSampleFactor;
-    }
-    
-    Bitmap aPreview (maRenderer.RenderPage (
-        &rPage,
-        aSize,
-        String(),
-        true,
-        false).GetBitmapEx().GetBitmap());
-    if (bDoSuperSampling && gbAllowSuperSampling)
-    {
-        aPreview.Scale(rPixelSize, BMP_SCALE_INTERPOLATE);
-    }
-    
-    return aPreview;
+	Size aSize (rPixelSize);
+	if (bDoSuperSampling && gbAllowSuperSampling)
+	{
+		aSize.Width() *= gnSuperSampleFactor;
+		aSize.Height() *= gnSuperSampleFactor;
+	}
+
+	Bitmap aPreview (maRenderer.RenderPage (
+		&rPage,
+		aSize,
+		String(),
+		true,
+		false).GetBitmapEx().GetBitmap());
+	if (bDoSuperSampling && gbAllowSuperSampling)
+	{
+		aPreview.Scale(rPixelSize, BMP_SCALE_FASTESTINTERPOLATE);
+	}
+
+	return aPreview;
 }
 
 
 } } } // end of namespace ::sd::slidesorter::cache
 
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/main/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 776bfc4335..496928a420 100644
--- a/main/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/main/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -212,15 +212,15 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
 		{
 			case 0 :
 				aPageOffset = Point(0, nOffset);
-				nTransparency = 0.85;
+				nTransparency = 0.95;
 				break;
 			case 1:
 				aPageOffset = Point(nOffset, 0);
-				nTransparency = 0.75;
+				nTransparency = 0.85;
 				break;
 			case 2:
 				aPageOffset = Point(2*nOffset, 2*nOffset);
-				nTransparency = 0.65;
+				nTransparency = 0.75;
 				break;
 		}
 		aPageOffset += aOffset;
@@ -274,8 +274,8 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
 		rContent.SetFillColor();
 		rContent.DrawRect(aBorderBox);
 
-		// Draw shadow around preview (removed now).
-		//mpShadowPainter->PaintFrame(rContent, aBorderBox);
+		// Draw shadow around preview.
+		mpShadowPainter->PaintFrame(rContent, aBorderBox);
 	}
 
 	return aPageOffset;