Files
libreoffice/toolkit/source/awt/vclxsplitter.cxx
Rüdiger Timm 79b088a81f INTEGRATION: CWS layoutdialogs (1.2.6); FILE MERGED
2008/07/30 11:13:24 rt 1.2.6.4: Update license header.
2008/03/27 13:08:18 jcn 1.2.6.3: Substitute TAB by 4 spaces.
2008/03/26 13:32:18 cl 1.2.6.2: fixing warnings
2008/03/20 11:56:26 jcn 1.2.6.1: Update from http://lilypond.org/~janneke/vc/toolkit.git/.git

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/awt/vclxwindow.cxx: Fix compile warning.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* util/makefile.mk: Revert obsolete VERSION addition.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/controls/dialogcontrol.cxx,
	source/controls/unocontrol.cxx, source/helper/tkresmgr.cxx,
	util/defs/wntmsci11: Revert weird initial patch.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO: Doc update.

2008-03-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
	inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
	source/vclcompat/wbutton.cxx, workben/layout/recover.xml: Implement
	MoreButton.  TODO: images.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/vclcompat/wbutton.cxx: Remove redraw cruft, rename
	redrawAlready to redraw.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, source/vclcompat/wbutton.cxx: Step
	towards cleaner redraw.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
	inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
	source/awt/vclxbutton.hxx, source/layout/helper.cxx,
	source/vclcompat/wbutton.cxx, workben/layout/recover.cxx,
	workben/layout/recover.hxx: Extract AdvancedButton implementation
	from recover.cxx into new widget.

2008-03-19  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/recover.cxx, workben/layout/recover.hxx,
	workben/layout/recover.xml: Update recover dialog, make
	advanced/simple switching work.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/zoom.cxx: In test mode, enable everything.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/localize.sdf: Manually add new translatable strings
	and translations for de, nl.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/zoom.xml: Update zoom to have hbox of Zoom factor
	and View layout alongside each other.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/zoom.cxx, workben/layout/zoom.hxx,
	workben/layout/zoom.xml: Merge upstream's zoom.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/vclcompat/wbutton.cxx, source/vclcompat/wrapper.hxx:
	Nitpick, debugging aid.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout.hxx, source/vclcompat/wrapper.cxx: Implement
	FixedLine.IsEnabled().

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* util/makefile.mk: Build lib name fix.

2008-03-14  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
	inc/layout/layout.hxx, source/vclcompat/wcontainer.cxx,
	workben/layout/recover.cxx, workben/layout/recover.hxx,
	workben/layout/recover.xml: Complete VBox/HBox wrappers.  Not use
	them in recover, spacing still wrong.

2008-03-13  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, workben/layout/recover.cxx,
	workben/layout/recover.hxx, workben/layout/recover.xml: More
	recovery dialog mockuping.

2008-03-13  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/layout/box-base.cxx: Implement visibility of
	elements/containers better.

2008-03-13  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
	inc/layout/layout.hxx, source/layout/helper.cxx,
	source/layout/import.cxx, source/layout/proplist.cxx,
	source/vclcompat/wbutton.cxx, source/vclcompat/wfield.cxx,
	source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx:
	Implement FixedImage.  Needed for recovery dialog.

2008-02-28  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/layout/box-base.hxx, workben/layout/editor.cxx: Give
	ChildData virtual distructor.

2008-02-28  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
	inc/layout/layout.hxx, source/layout/helper.cxx,
	source/vclcompat/makefile.mk, source/vclcompat/wrapper.cxx,
	util/makefile.mk, workben/layout/makefile.mk,
	workben/layout/recover.cxx, workben/layout/recover.hxx,
	workben/layout/recover.xml, workben/layout/test.cxx: Stab at new
	recover dialog.

2008-02-28  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/editor.cxx: Do not clear fresh container.  Disable
	debug printing.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, workben/layout/localize.sdf: Fix localize.sdf for
	wordcount.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-pre.hxx, source/layout/dialogbuttonhbox.cxx: Fix
	ID for displaying dialogs.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, workben/layout/localize.sdf,
	workben/layout/wordcount.xml, workben/layout/zoom.xml: Add strings
	for all languages.

2008-02-27  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, source/awt/vclxsplitter.cxx,
	source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
	source/awt/vclxtabcontrol.hxx, source/layout/box-base.cxx,
	source/layout/box-base.hxx, source/layout/box.cxx,
	source/layout/box.hxx, source/layout/container.cxx,
	source/layout/dialogbuttonhbox.cxx,
	source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
	source/layout/flow.cxx, source/layout/helper.cxx,
	source/layout/import.hxx, source/layout/makefile.mk,
	source/layout/proplist.cxx, source/layout/root.cxx,
	source/layout/table.cxx, source/layout/table.hxx,
	source/layout/timer.cxx, source/vclcompat/wcontainer.cxx,
	source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx: Clean-up
	code duplication from layout: new Box_Base class implements
	addChild, removeChild, getChildren, getChildProperties for Box,
	Table, VCLXSplitter, VCLXTabControl.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, source/layout/root.cxx: Document more fixmes.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, source/layout/proplist.cxx: Remove m237
	workaround.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/layout/helper.cxx: More comment cleanups.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/awt/vclxtabcontrol.cxx, source/layout/box.cxx,
	source/layout/container.cxx, source/vclcompat/wrapper.cxx:
	Commented-out code cleanups.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
	inc/layout/layout.hxx, inc/layout/layoutcore.hxx,
	source/awt/forward.hxx, source/awt/vclxbutton.cxx,
	source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx,
	source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx,
	source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx,
	source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx,
	source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
	source/awt/vclxtabcontrol.hxx, source/layout/bin.cxx,
	source/layout/bin.hxx, source/layout/box.cxx,
	source/layout/box.hxx, source/layout/container.cxx,
	source/layout/container.hxx, source/layout/dialogbuttonhbox.cxx,
	source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
	source/layout/factory.hxx, source/layout/flow.cxx,
	source/layout/flow.hxx, source/layout/helper.cxx,
	source/layout/helper.hxx, source/layout/import.cxx,
	source/layout/import.hxx, source/layout/makefile.mk,
	source/layout/precompiled_xmlscript.hxx,
	source/layout/proplist.cxx, source/layout/proplist.hxx,
	source/layout/root.cxx, source/layout/root.hxx,
	source/layout/table.cxx, source/layout/table.hxx,
	source/layout/timer.cxx, source/layout/timer.hxx,
	source/layout/translate.cxx, source/layout/translate.hxx,
	source/vclcompat/makefile.mk, source/vclcompat/wbutton.cxx,
	source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx,
	source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx,
	workben/layout/editor.cxx, workben/layout/editor.hxx,
	workben/layout/makefile.mk, workben/layout/simple-paragraph.cxx,
	workben/layout/simple-paragraph.hxx, workben/layout/test.cxx,
	workben/layout/uno.hxx, workben/layout/zoom_def.hxx: Add licence
	headers.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* workben/layout/meekfile.mk: Junk meekfile.mk

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO: Update TODO.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
	source/awt/vclxwindows.cxx: Move VCLXScrollBar's getMinimumSize()
	from VCLXWindow's switch to method.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
	source/awt/vclxwindows.cxx: Move VCLXMessageBox's getMinimumSize()
	from VCLXWindow's switch to method.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, inc/toolkit/awt/vclxtopwindow.hxx,
	source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
	source/awt/vclxtopwindow.cxx: Remove code duplication from
	VCLXDialog.

2008-02-26  Jan Nieuwenhuizen <janneke@gnu.org>

	* source/awt/vclxdialog.cxx, source/vclcompat/wbutton.cxx,
	source/vclcompat/wcontainer.cxx, source/vclcompat/wrapper.hxx:
	Comment cleanup.

2008-02-21  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, source/layout/helper.hxx,
	workben/layout/editor.cxx, workben/layout/wordcountdialog.cxx: Fix
	remaining SUN warnings.

2008-02-21  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/layout/layout.hxx, source/awt/vclxfixedline.hxx,
	source/layout/byteseq.cxx, source/layout/helper.hxx,
	source/layout/import.cxx, source/layout/makefile.mk,
	source/layout/proplist.cxx, source/layout/translate.hxx,
	source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx,
	source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx,
	source/vclcompat/wrapper.hxx, workben/layout/editor.cxx: Fix some
	sunstudio12 warnings.

2008-02-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* doc/layout/TODO, source/awt/makefile.mk,
	source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
	source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx,
	source/layout/helper.cxx: Junk VCLXProxy.

2008-02-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* inc/toolkit/awt/vclxwindows.hxx,
	inc/toolkit/helper/listenermultiplexer.hxx,
	source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
	source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
	source/layout/helper.cxx: Hello world on AWTVCLXCancelButton() label
	and images.

2008-02-20  Jan Nieuwenhuizen <janneke@gnu.org>

	* .gitignore, source/awt/forward.hxx, source/awt/makefile.mk,
	source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
	source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx,
	source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx,
	source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx,
	source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
	source/layout/makefile.mk, workben/layout/localize-de.sdf,
	workben/layout/localize-nl.sdf: Cleanup of includes, namespace in
	headers in awt.
2008-07-30 12:56:10 +00:00

250 lines
7.3 KiB
C++

/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: vclxsplitter.cxx,v $
*
* $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include "vclxsplitter.hxx"
#include <assert.h>
#include <com/sun/star/awt/PosSize.hpp>
#include <sal/macros.h>
#include <toolkit/helper/property.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/split.hxx>
#include "forward.hxx"
namespace layoutimpl
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
VCLXSplitter::ChildProps::ChildProps( VCLXSplitter::ChildData *pData )
{
addProp( RTL_CONSTASCII_USTRINGPARAM( "Shrink" ),
::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
&(pData->mbShrink) );
}
VCLXSplitter::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
: Box_Base::ChildData( xChild )
, mbShrink( false )
{
}
VCLXSplitter::ChildData*
VCLXSplitter::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
{
return new ChildData( xChild );
}
VCLXSplitter::ChildProps*
VCLXSplitter::createChildProps( Box_Base::ChildData *pData )
{
return new ChildProps( static_cast<VCLXSplitter::ChildData*> ( pData ) );
}
DBG_NAME( VCLXSplitter );
VCLXSplitter::VCLXSplitter( bool bHorizontal )
: VCLXWindow()
, Box_Base()
{
DBG_CTOR( VCLXSplitter, NULL );
mnHandleRatio = 0.5;
mbHandlePressed = false;
mbHorizontal = bHorizontal;
mpSplitter = NULL;
}
VCLXSplitter::~VCLXSplitter()
{
DBG_DTOR( VCLXSplitter, NULL );
}
IMPLEMENT_2_FORWARD_XINTERFACE1( VCLXSplitter, VCLXWindow, Container );
IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXSplitter, VCLXWindow );
VCLXSplitter::ChildData*
VCLXSplitter::getChild( int i )
{
if ( maChildren.size() && i == 0 )
return static_cast<VCLXSplitter::ChildData*>( maChildren.front() );
else if ( maChildren.size() > 1 && i == 1 )
return static_cast<VCLXSplitter::ChildData*>( maChildren.back() );
return 0;
}
void SAL_CALL VCLXSplitter::dispose() throw(RuntimeException)
{
{
::vos::OGuard aGuard( GetMutex() );
EventObject aDisposeEvent;
aDisposeEvent.Source = *this;
// maTabListeners.disposeAndClear( aDisposeEvent );
}
VCLXWindow::dispose();
}
void VCLXSplitter::ensureSplitter()
{
if ( !mpSplitter )
{
mpSplitter = new Splitter( GetWindow() , mbHorizontal ? WB_HORZ : WB_VERT );
mpSplitter->Show();
mpSplitter->SetEndSplitHdl( LINK( this, VCLXSplitter, HandleMovedHdl ) );
}
}
void SAL_CALL VCLXSplitter::addChild(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XLayoutConstrains > &xChild )
throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::awt::MaxChildrenException)
{
if ( maChildren.size() == 2 )
throw css::awt::MaxChildrenException();
Box_Base::addChild( xChild );
}
void SAL_CALL VCLXSplitter::allocateArea(
const ::com::sun::star::awt::Rectangle &rArea )
throw (::com::sun::star::uno::RuntimeException)
{
ensureSplitter(); // shouldn't be needed...
getMinimumSize();
int splitDiff;
if ( mbHorizontal )
splitDiff = rArea.Width - maAllocation.Width;
else
splitDiff = rArea.Height - maAllocation.Height;
assert( mpSplitter );
if ( splitDiff )
mpSplitter->SetSplitPosPixel( mpSplitter->GetSplitPosPixel() + splitDiff/2 );
maAllocation = rArea;
int width = mbHorizontal ? rArea.Width : rArea.Height;
int splitLen = 2;
int splitPos = mpSplitter->GetSplitPosPixel();
setPosSize( rArea.X, rArea.Y, rArea.Width, rArea.Height, PosSize::POSSIZE );
if ( mbHorizontal )
mpSplitter->SetPosSizePixel( splitPos, 0, splitLen, rArea.Height, PosSize::POSSIZE );
else
mpSplitter->SetPosSizePixel( 0, splitPos, rArea.Width, splitLen, PosSize::POSSIZE );
mpSplitter->SetDragRectPixel( ::Rectangle( 0, 0, rArea.Width, rArea.Height ) );
int leftWidth = splitPos;
int rightWidth = width - splitPos;
if ( getChild( 0 ) && getChild( 0 )->mxChild.is() )
{
awt::Rectangle childRect( 0, 0, rArea.Width, rArea.Height );
if ( mbHorizontal )
childRect.Width = leftWidth - 2;
else
childRect.Height = leftWidth - 2;
allocateChildAt( getChild( 0 )->mxChild, childRect );
}
if ( getChild( 0 ) && getChild( 0 )->mxChild.is() )
{
awt::Rectangle childRect( 0, 0, rArea.Width, rArea.Height );
if ( mbHorizontal )
{
childRect.X += leftWidth + splitLen + 2;
childRect.Width = rightWidth;
}
else
{
childRect.Y += leftWidth + splitLen + 2;
childRect.Height = rightWidth;
}
allocateChildAt( getChild( 1 )->mxChild, childRect );
}
}
::com::sun::star::awt::Size SAL_CALL VCLXSplitter::getMinimumSize()
throw(::com::sun::star::uno::RuntimeException)
{
ensureSplitter();
awt::Size size( mbHorizontal ? 2 : 0, mbHorizontal ? 0 : 2 );
for ( unsigned int i = 0; i < 2; i++ )
{
if ( getChild( i ) && getChild( i )->mxChild.is() )
{
awt::Size childSize = getChild( i )->mxChild->getMinimumSize();
if ( mbHorizontal )
{
size.Width += childSize.Width;
size.Height = SAL_MAX( size.Height, childSize.Height );
}
else
{
size.Width = SAL_MAX( size.Width, childSize.Width );
size.Height += childSize.Height;
}
}
}
maRequisition = size;
return size;
}
void VCLXSplitter::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
}
void SAL_CALL VCLXSplitter::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
{
VCLXWindow::setProperty( PropertyName, Value );
}
Any SAL_CALL VCLXSplitter::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
{
return VCLXWindow::getProperty( PropertyName );
}
IMPL_LINK( VCLXSplitter, HandleMovedHdl, Splitter *, pSplitter )
{
(void) pSplitter;
forceRecalc();
return 0;
}
} // namespace layoutimpl