[ooo-build-commit] .: patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed May 12 06:37:44 PDT 2010
patches/dev300/apply | 3
patches/dev300/toolbar-decorations-svx-undo-redo.diff | 74 ++++++++++++++++++
patches/dev300/toolbar-decorations-svx.diff | 28 ------
patches/dev300/toolbar-decorations-vcl.diff | 32 +++++--
4 files changed, 99 insertions(+), 38 deletions(-)
New commits:
commit cd7d636d9626569d8a36968ba2ff23652393cd7f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed May 12 15:35:39 2010 +0200
Update the 'Undo' and 'Redo' toolbar tools too.
* patches/dev300/apply: Add.
* patches/dev300/toolbar-decorations-svx-undo-redo.diff: The update.
* patches/dev300/toolbar-decorations-svx.diff: Move the undo/redo related bits
to the patch above.
* patches/dev300/toolbar-decorations-vcl.diff: Fix redrawing of the title when
updated.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index adeef64..b8e818e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3946,6 +3946,9 @@ toolbar-decorations-svx.diff
# 'New table' toolbar widget rework, and a small update of the 'Colums' widget
toolbar-decorations-svx-tables-columns.diff
+# Update the 'Undo' and 'Redo' widgets
+toolbar-decorations-svx-undo-redo.diff
+
# The proof-of-concept
#toolbar-decorations-fix.diff, cbosdo
# Not too well looking, but might be useful?
diff --git a/patches/dev300/toolbar-decorations-svx-undo-redo.diff b/patches/dev300/toolbar-decorations-svx-undo-redo.diff
new file mode 100644
index 0000000..94b562d
--- /dev/null
+++ b/patches/dev300/toolbar-decorations-svx-undo-redo.diff
@@ -0,0 +1,74 @@
+diff --git svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/lboxctrl.cxx
+index 24caa3c..a1b170e 100644
+--- svx/source/tbxctrls/lboxctrl.cxx
++++ svx/source/tbxctrls/lboxctrl.cxx
+@@ -70,7 +70,6 @@ class SvxPopupWindowListBox : public SfxPopupWindow
+ {
+ using FloatingWindow::StateChanged;
+
+- FixedInfo aInfo;
+ ListBox * pListBox;
+ ToolBox & rToolBox;
+ BOOL bUserSel;
+@@ -95,7 +94,6 @@ public:
+
+ void StartSelection();
+ inline ListBox & GetListBox() { return *pListBox; }
+- inline FixedInfo & GetInfo() { return aInfo; }
+
+ BOOL IsUserSelected() const { return bUserSel; }
+ void SetUserSelected( BOOL bVal ) { bUserSel = bVal; }
+@@ -106,7 +104,6 @@ public:
+
+ SvxPopupWindowListBox::SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nId, ToolBox& rTbx ) :
+ SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ),
+- aInfo ( this, SVX_RES( FT_NUM_OPERATIONS ) ),
+ rToolBox ( rTbx ),
+ bUserSel ( FALSE ),
+ nTbxId ( nId ),
+@@ -242,7 +239,7 @@ void SvxListBoxControl::Impl_SetInfo( USHORT nCount )
+
+ String aText( aActionStr );
+ aText.SearchAndReplaceAllAscii( "$(ARG1)", String::CreateFromInt32( nCount ) );
+- pPopupWin->GetInfo().SetText( aText );
++ pPopupWin->SetText( aText );
+ }
+
+
+diff --git svx/source/tbxctrls/lboxctrl.src svx/source/tbxctrls/lboxctrl.src
+index 97ab4c8..2022ddd 100644
+--- svx/source/tbxctrls/lboxctrl.src
++++ svx/source/tbxctrls/lboxctrl.src
+@@ -32,12 +32,10 @@
+ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
+ {
+ Pos = MAP_APPFONT ( 0 , 0 ) ;
+- Size = MAP_APPFONT ( 150 , 74 ) ;
++ Size = MAP_APPFONT ( 102 , 87 ) ;
+ HelpID = HID_SVXTBX_UNDO_REDO_CTRL ;
+- SysWin = TRUE;
+- Border = TRUE ;
++ StdPopup = TRUE;
+ Hide = TRUE ;
+- SVLook = TRUE ;
+ OutputSize = TRUE ;
+
+ ListBox LB_SVXTBX_UNDO_REDO_CTRL
+@@ -41,16 +41,11 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
+ ListBox LB_SVXTBX_UNDO_REDO_CTRL
+ {
+ Pos = MAP_APPFONT ( 0 , 0 ) ;
+- Size = MAP_APPFONT ( 150 , 60 ) ;
++ Size = MAP_APPFONT ( 100 , 85 ) ;
+ Border = TRUE ;
+ DropDown = FALSE ;
+ OutputSize = TRUE ;
+ };
+- FixedText FT_NUM_OPERATIONS
+- {
+- Pos = MAP_APPFONT ( 6 , 64 ) ;
+- Size = MAP_APPFONT ( 138 , 10 ) ;
+- };
+ };
+
+ String RID_SVXSTR_NUM_UNDO_ACTIONS
diff --git a/patches/dev300/toolbar-decorations-svx.diff b/patches/dev300/toolbar-decorations-svx.diff
index 5c9f973..83a1545 100644
--- a/patches/dev300/toolbar-decorations-svx.diff
+++ b/patches/dev300/toolbar-decorations-svx.diff
@@ -96,34 +96,6 @@ index e2e6e47..2b960db 100644
Text [ en-US ] = "Fontwork Character Spacing" ;
-diff --git svx/source/tbxctrls/lboxctrl.src svx/source/tbxctrls/lboxctrl.src
-index 18e3456..97ab4c8 100644
---- svx/source/tbxctrls/lboxctrl.src
-+++ svx/source/tbxctrls/lboxctrl.src
-@@ -32,12 +32,10 @@
- FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
- {
- Pos = MAP_APPFONT ( 0 , 0 ) ;
-- Size = MAP_APPFONT ( 150 , 74 ) ;
-+ Size = MAP_APPFONT ( 152 , 74 ) ;
- HelpID = HID_SVXTBX_UNDO_REDO_CTRL ;
-- SysWin = TRUE;
-- Border = TRUE ;
-+ StdPopup = TRUE;
- Hide = TRUE ;
-- SVLook = TRUE ;
- OutputSize = TRUE ;
-
- ListBox LB_SVXTBX_UNDO_REDO_CTRL
-@@ -50,7 +48,7 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
- };
- FixedText FT_NUM_OPERATIONS
- {
-- Pos = MAP_APPFONT ( 6 , 64 ) ;
-+ Pos = MAP_APPFONT ( 2 , 64 ) ;
- Size = MAP_APPFONT ( 138 , 10 ) ;
- };
- };
diff --git svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/linectrl.cxx
index 2a69a5f..df3378c 100644
--- svx/source/tbxctrls/linectrl.cxx
diff --git a/patches/dev300/toolbar-decorations-vcl.diff b/patches/dev300/toolbar-decorations-vcl.diff
index b492d61..70361cb 100644
--- a/patches/dev300/toolbar-decorations-vcl.diff
+++ b/patches/dev300/toolbar-decorations-vcl.diff
@@ -95,6 +95,16 @@ index 4bebcd9..9b0d610 100644
pData->maTitleRect.Left() = pData->mnLeftBorder;
pData->maTitleRect.Right() = nWidth-pData->mnRightBorder-1;
+@@ -1663,7 +1663,8 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
+ Rectangle aInRect( aTmpPoint, Size( pData->mnWidth, pData->mnHeight ) );
+ const StyleSettings& rStyleSettings = pData->mpOutDev->GetSettings().GetStyleSettings();
+ DecorationView aDecoView( pDev );
+- Color aFrameColor( rStyleSettings.GetFaceColor() );
++ Color aFaceColor( rStyleSettings.GetFaceColor() );
++ Color aFrameColor( aFaceColor );
+
+ aFrameColor.DecreaseContrast( (UINT8) (0.50 * 255));
+
@@ -1670,12 +1670,35 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
// Draw Frame
if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME )
@@ -131,17 +141,19 @@ index 4bebcd9..9b0d610 100644
}
else
aInRect = aDecoView.DrawFrame( aInRect, FRAME_DRAW_DOUBLEOUT | FRAME_DRAW_NODRAW);
-@@ -1707,8 +1730,9 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
- Rectangle aTitleRect( pData->maTitleRect );
- if( pOffset )
- aTitleRect.Move( pOffset->X(), pOffset->Y() );
-- pDev->DrawRect( aTitleRect );
+@@ -1725,7 +1726,11 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
+ aInRect = pData->maTitleRect;
+ // use no gradient anymore, just a static titlecolor
+- pDev->SetFillColor( aFrameColor );
+ if ( pData->mnTitleType != BORDERWINDOW_TITLE_POPUP )
-+ pDev->DrawRect( aTitleRect );
-
- if ( pData->mnTitleType != BORDERWINDOW_TITLE_TEAROFF )
- {
++ pDev->SetFillColor( aFrameColor );
++ else
++ pDev->SetFillColor( aFaceColor );
++
+ pDev->SetTextColor( rStyleSettings.GetButtonTextColor() );
+ Rectangle aTitleRect( pData->maTitleRect );
+ if( pOffset )
@@ -1837,7 +1861,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
{
// Alle WindowBits entfernen, die wir nicht haben wollen
@@ -179,7 +191,7 @@ index 0d39900..117a9fd 100644
mnOldTitle = mnTitle;
- if ( nFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF )
- SetTitleType( FLOATWIN_TITLE_TEAROFF );
-+ if ( mpWindowImpl->mnStyle & WB_POPUP )
++ if ( ( mpWindowImpl->mnStyle & WB_POPUP ) && GetText().Len() )
+ SetTitleType( FLOATWIN_TITLE_POPUP );
+ else if ( nFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF )
+ SetTitleType( FLOATWIN_TITLE_TEAROFF );
More information about the ooo-build-commit
mailing list