dba34a: #i97111# make the 'Test Connection' button big enough to display all its text

5 files changed, 26 insertions, 3 deletions

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index b2607ebc9f98..a1a146cd7b4b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -220,6 +220,8 @@ namespace dbaui
         m_aTestJavaDriver.SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
 
         FreeResource();
+
+        LayoutHelper::fitSizeRightAligned( m_aTestConnection );
     }
 
     // -----------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index c340e3576f34..cfc3deda1149 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -844,6 +844,8 @@ DBG_NAME(OAuthentificationPageSetup)
         m_aCBPasswordRequired.SetClickHdl(getControlModifiedLink());
            m_aPBTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
         FreeResource();
+
+        LayoutHelper::fitSizeRightAligned( m_aPBTestConnection );
     }
 
 
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 8e5b61dc9076..d19052525a76 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -313,7 +313,6 @@ namespace dbaui
         SetControlFontWeight(m_pFT_HeaderText);
     }
 
-
     //=========================================================================
     //= LayoutHelper
     //=========================================================================
@@ -331,6 +330,24 @@ namespace dbaui
         _rControl.SetPosPixel( aControlPos );
     }
 
+    //-------------------------------------------------------------------------
+    void LayoutHelper::fitSizeRightAligned( PushButton& io_button )
+    {
+        const Point aOldPos = io_button.GetPosPixel();
+        const Size aOldSize = io_button.GetSizePixel();
+        const Size aMinSize( io_button.CalcMinimumSize() );
+        if ( aMinSize.Width() > aOldSize.Width() )
+        {
+            io_button.SetPosSizePixel(
+                aOldPos.X() + aOldSize.Width() - aMinSize.Width(),
+                0,
+                aMinSize.Width(),
+                0,
+                WINDOW_POSSIZE_X | WINDOW_POSSIZE_WIDTH
+            );
+        }
+    }
+
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 32ba0064a824..be6b923c2997 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -288,6 +288,10 @@ namespace dbaui
                             const ControlRelation _eRelation,
                             const long _nIndentAppFont
                         );
+        /** fits the button size to be large enough to contain the buttons text
+        */
+        static void fitSizeRightAligned( PushButton& io_button );
+            // why is CalcMinimumSize not a virtual method of ::Window?
     };
 
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index 270741d00857..ca0d3ab8cde7 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -137,8 +137,6 @@ SLOFILES+=		$(SLO)$/adodatalinks.obj
 .ENDIF
 
 # --- Targets ----------------------------------
-#LOCALIZE_ME=AutoControls_tmpl.hrc
-
 .INCLUDE : target.mk
 
 $(SLO)$/ConnectionHelper.obj : $(LOCALIZE_ME_DEST)