Files
libreoffice/toolkit/source/layout/flow.cxx
Rüdiger Timm 45bcea80a8 INTEGRATION: CWS layoutdialogs (1.2.6); FILE MERGED
2008/07/30 11:14:53 rt 1.2.6.2: Update license header.
2008/03/20 11:56:27 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 13:01:01 +00:00

208 lines
5.6 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: flow.cxx,v $
*
* $Revision: 1.3 $
*
* 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 "flow.hxx"
#include <sal/macros.h>
namespace layoutimpl
{
using namespace css;
bool Flow::ChildData::isVisible()
{
return xChild.is();
}
Flow::Flow()
: Container()
, mnSpacing( 0 )
, mbHomogeneous( false )
{
addProp( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ),
::getCppuType( static_cast< const sal_Bool* >( NULL ) ),
&mbHomogeneous );
addProp( RTL_CONSTASCII_USTRINGPARAM( "Spacing" ),
::getCppuType( static_cast< const sal_Int32* >( NULL ) ),
&mnSpacing );
}
void SAL_CALL
Flow::addChild( const uno::Reference< awt::XLayoutConstrains >& xChild )
throw (uno::RuntimeException, css::awt::MaxChildrenException)
{
if ( xChild.is() )
{
ChildData *pData = new ChildData();
pData->xChild = xChild;
maChildren.push_back( pData );
setChildParent( xChild );
queueResize();
}
}
void SAL_CALL
Flow::removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& xChild )
throw (css::uno::RuntimeException)
{
for ( std::list< ChildData * >::iterator it = maChildren.begin();
it != maChildren.end(); it++ )
{
if ( (*it)->xChild == xChild )
{
delete *it;
maChildren.erase( it );
unsetChildParent( xChild );
queueResize();
break;
}
}
}
css::uno::Sequence< css::uno::Reference < css::awt::XLayoutConstrains > > SAL_CALL
Flow::getChildren()
throw (css::uno::RuntimeException)
{
uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
unsigned int i = 0;
for ( std::list< ChildData * >::iterator it = maChildren.begin();
it != maChildren.end(); it++, i++ )
children[i] = (*it)->xChild;
return children;
}
uno::Reference< beans::XPropertySet > SAL_CALL
Flow::getChildProperties( const uno::Reference< awt::XLayoutConstrains >& /*xChild*/ )
throw (uno::RuntimeException)
{
return uno::Reference< beans::XPropertySet >();
}
css::awt::Size
Flow::calculateSize( long nMaxWidth )
{
long nNeedHeight = 0;
std::list<ChildData *>::const_iterator it;
mnEachWidth = 0;
// first pass, for homogeneous property
for (it = maChildren.begin(); it != maChildren.end(); it++)
{
if ( !(*it)->isVisible() )
continue;
(*it)->aRequisition = (*it)->xChild->getMinimumSize();
if ( mbHomogeneous )
mnEachWidth = SAL_MAX( mnEachWidth, (*it)->aRequisition.Width );
}
long nRowWidth = 0, nRowHeight = 0;
for (it = maChildren.begin(); it != maChildren.end(); it++)
{
if ( !(*it)->isVisible() )
continue;
awt::Size aChildSize = (*it)->aRequisition;
if ( mbHomogeneous )
aChildSize.Width = mnEachWidth;
if ( nMaxWidth && nRowWidth > 0 && nRowWidth + aChildSize.Width > nMaxWidth )
{
nRowWidth = 0;
nNeedHeight += nRowHeight;
nRowHeight = 0;
}
nRowHeight = SAL_MAX( nRowHeight, aChildSize.Height );
nRowWidth += aChildSize.Width;
}
nNeedHeight += nRowHeight;
return awt::Size( nRowWidth, nNeedHeight );
}
awt::Size SAL_CALL
Flow::getMinimumSize() throw(uno::RuntimeException)
{
return maRequisition = calculateSize( 0 );
}
sal_Bool SAL_CALL
Flow::hasHeightForWidth()
throw(css::uno::RuntimeException)
{
return true;
}
sal_Int32 SAL_CALL
Flow::getHeightForWidth( sal_Int32 nWidth )
throw(css::uno::RuntimeException)
{
return calculateSize( nWidth ).Height;
}
void SAL_CALL
Flow::allocateArea( const css::awt::Rectangle &rArea )
throw (css::uno::RuntimeException)
{
maAllocation = rArea;
std::list<ChildData *>::const_iterator it;
long nX = 0, nY = 0, nRowHeight = 0;
for (it = maChildren.begin(); it != maChildren.end(); it++)
{
ChildData *child = *it;
if ( !child->isVisible() )
continue;
awt::Size aChildSize( child->aRequisition );
if ( mbHomogeneous )
aChildSize.Width = mnEachWidth;
if ( nX > 0 && nX + aChildSize.Width > rArea.Width )
{
nX = 0;
nY += nRowHeight;
nRowHeight = 0;
}
nRowHeight = SAL_MAX( nRowHeight, aChildSize.Height );
allocateChildAt( child->xChild,
awt::Rectangle( rArea.X + nX, rArea.Y + nY, aChildSize.Width, aChildSize.Height ) );
nX += aChildSize.Width;
}
}
} // namespace layoutimpl