[openoffice] branch AOO42X updated: Fixed close button for Help Agent

[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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 4eccd1a  Fixed close button for Help Agent
4eccd1a is described below

commit 4eccd1abd27cbc9fa9160aa3e74639e48a9572ea
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Jul 27 17:02:16 2020 +0200

    Fixed close button for Help Agent
    
    (cherry picked from commit b3f7051078a317a8cdbeb35bf3d4f6a1701bc3bf)
---
 main/svtools/source/misc/helpagentwindow.cxx | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/main/svtools/source/misc/helpagentwindow.cxx b/main/svtools/source/misc/helpagentwindow.cxx
index 9a2e9d6..f09682c 100644
--- a/main/svtools/source/misc/helpagentwindow.cxx
+++ b/main/svtools/source/misc/helpagentwindow.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.
- * 
+ *
  *************************************************************/
 
 
@@ -72,8 +72,7 @@ namespace svt
 	{
 		// -----------------
 		// the closer button
-		Bitmap aCloserBitmap(SvtResId(BMP_HELP_AGENT_CLOSER));
-        Image aCloserImage( aCloserBitmap, Color(COL_LIGHTMAGENTA) );
+		Bitmap aCloserImage(SvtResId(BMP_HELP_AGENT_CLOSER));
 		m_pCloser = new CloserButton_Impl( this, WB_NOTABSTOP | WB_NOPOINTERFOCUS );
 		static_cast<CloserButton_Impl*>(m_pCloser)->SetModeImage( aCloserImage );
 		static_cast<CloserButton_Impl*>(m_pCloser)->SetClickHdl( LINK(this, HelpAgentWindow, OnButtonClicked) );
@@ -95,7 +94,7 @@ namespace svt
 		m_aPreferredSize.Height() += aSize.Height() - aOutputSize.Height();
 
 		SetPointer(Pointer(POINTER_REFHAND));
-        AlwaysEnableInput( sal_True, sal_True );
+		AlwaysEnableInput( sal_True, sal_True );
 
 		// unique id for the testtool
 		SetUniqueId( HID_HELPAGENT_WINDOW );
@@ -150,8 +149,8 @@ namespace svt
 	{
 		Size aPreferredSize = _rButtonImage.GetSizePixel();
 		// add a small frame, needed by the button
-		aPreferredSize.Width() += 5;
-		aPreferredSize.Height() += 5;
+		aPreferredSize.Width() += 8;
+		aPreferredSize.Height() += 8;
 		return aPreferredSize;
 	}
 
@@ -163,7 +162,7 @@ namespace svt
 		Size aOutputSize = GetOutputSizePixel();
 		Size aCloserSize = m_pCloser->GetSizePixel();
 		if (m_pCloser)
-			m_pCloser->SetPosPixel( Point(aOutputSize.Width() - aCloserSize.Width() - 3, 4) );
+			m_pCloser->SetPosPixel( Point(aOutputSize.Width() - aCloserSize.Width() - 2, 2) );
 	}
 
 	//--------------------------------------------------------------------