framework/source/services/backingwindow.cxx | 19 ++++++++++ officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 7 --- 2 files changed, 20 insertions(+), 6 deletions(-)
New commits: commit 5f2825dde8a44773fc6ce19f2dd4e328c4e88eaf Author: Gábor Stefanik <netrolller...@gmail.com> Date: Thu Apr 12 14:08:02 2012 +0200 fdo#34392 recompute column widths after font scale change in startcenter diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index ca0e9e7..0b07e6f 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -273,6 +273,8 @@ void BackingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { initBackground(); Invalidate(); + // fdo#34392: Resize buttons to match the new text size. + Resize(); } } @@ -797,6 +799,23 @@ void BackingWindow::Resize() long nYPos = maControlRect.Top() + mnBtnTop; + // Recompute column widths + mnTextColumnWidth[0] = maWriterButton.GetTextWidth( maWriterButton.GetText() ) + maButtonImageSize.Width() + 8; + if( mnTextColumnWidth[0] < maCalcButton.GetTextWidth( maCalcButton.GetText() ) + maButtonImageSize.Width() + 8 ) + mnTextColumnWidth[0] = maCalcButton.GetTextWidth( maCalcButton.GetText() ) + maButtonImageSize.Width() + 8; + if( mnTextColumnWidth[0] < maImpressButton.GetTextWidth( maImpressButton.GetText() ) + maButtonImageSize.Width() + 8 ) + mnTextColumnWidth[0] = maImpressButton.GetTextWidth( maImpressButton.GetText() ) + maButtonImageSize.Width() + 8; + if( mnTextColumnWidth[0] < maOpenButton.GetTextWidth( maOpenButton.GetText() ) + maButtonImageSize.Width() + 26 ) + mnTextColumnWidth[0] = maOpenButton.GetTextWidth( maOpenButton.GetText() ) + maButtonImageSize.Width() + 26; + + mnTextColumnWidth[1] = maDrawButton.GetTextWidth( maDrawButton.GetText() ) + maButtonImageSize.Width() + 8; + if( mnTextColumnWidth[1] < maDBButton.GetTextWidth( maDBButton.GetText() ) + maButtonImageSize.Width() + 8 ) + mnTextColumnWidth[1] = maDBButton.GetTextWidth( maDBButton.GetText() ) + maButtonImageSize.Width() + 8; + if( mnTextColumnWidth[1] < maMathButton.GetTextWidth( maMathButton.GetText() ) + maButtonImageSize.Width() + 8 ) + mnTextColumnWidth[1] = maMathButton.GetTextWidth( maMathButton.GetText() ) + maButtonImageSize.Width() + 8; + if( mnTextColumnWidth[1] < maTemplateButton.GetTextWidth( maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8 ) + mnTextColumnWidth[1] = maTemplateButton.GetTextWidth( maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8; + maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) ); maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) ); nYPos += nBDelta - nDiff; commit 25c194163c531648f7ad8cdb1a64a03407f75efc Author: Andras Timar <ati...@suse.com> Date: Thu Apr 12 12:55:55 2012 +0200 fdo#48584 Shift+F3 should be the shourtcut for Edit > Duplicate in Draw ... just like it is in Impress. The fix for fdo#32559 was partially reverted. I think .uno:CopyObjects is more useful in Draw, than .uno:ChangeCaseRotateCase. diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 30702f9..685b7b4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1131,14 +1131,9 @@ <value xml:lang="en-US">.uno:LeaveGroup</value> </prop> </node> - <!--<node oor:name="F3_SHIFT" oor:op="replace"> - <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:CopyObjects</value> - </prop> - </node>--> <node oor:name="F3_SHIFT" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">.uno:ChangeCaseRotateCase</value> + <value xml:lang="en-US">.uno:CopyObjects</value> </prop> </node> <node oor:name="F4" oor:op="replace">
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits