ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

toolkit: clang-format svt::table::MouseFunction subclasses code

Browse Source 
This in particular also gets rid of an extra level of indentation
in toolkit/source/controls/table/mousefunction.cxx.

Change-Id: I1e5f8db7b281fb1d68d7819c5d99efae13c0cea4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211081
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-09-19 16:09:32 +02:00
parent d3a3a0a739
commit e094407cae
2 changed files with 188 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solenv/clang-format/excludelist
-1
View File
@@ -13326,7 +13326,6 @@ toolkit/source/controls/table/AccessibleGridControlTableBase.cxx
toolkit/source/controls/table/cellvalueconversion.cxx
toolkit/source/controls/table/cellvalueconversion.hxx
toolkit/source/controls/table/gridtablerenderer.cxx
toolkit/source/controls/table/mousefunction.cxx
toolkit/source/controls/table/tabledatawindow.cxx
toolkit/source/controls/table/tabledatawindow.hxx
toolkit/source/controls/table/tablegeometry.cxx
toolkit/source/controls/table/mousefunction.cxx
+188 -200
View File
@@ -26,248 +26,236 @@
namespace svt::table
{
//= ColumnResize
FunctionResult ColumnResize::handleMouseMove(ITableControl& i_tableControl,
MouseEvent const& i_event)
{
Point const aPoint = i_event.GetPosPixel();
//= ColumnResize
FunctionResult ColumnResize::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event )
if (m_nResizingColumn == COL_INVALID)
{
Point const aPoint = i_event.GetPosPixel();
if ( m_nResizingColumn == COL_INVALID )
{
// if we hit a column divider, change the mouse pointer accordingly
PointerStyle aNewPointer( PointerStyle::Arrow );
TableCell const tableCell = i_tableControl.hitTest( aPoint );
if ( ( tableCell.nRow == ROW_COL_HEADERS ) && ( tableCell.eArea == ColumnDivider ) )
{
aNewPointer = PointerStyle::HSplit;
}
i_tableControl.setPointer( aNewPointer );
return SkipFunction; // TODO: is this correct?
}
::Size const tableSize = i_tableControl.getTableSizePixel();
// set proper pointer
PointerStyle aNewPointer( PointerStyle::Arrow );
ColumnMetrics const columnMetrics( i_tableControl.getColumnMetrics( m_nResizingColumn ) );
if ( ( aPoint.X() > tableSize.Width() )
|| ( aPoint.X() < columnMetrics.nStartPixel )
)
{
aNewPointer = PointerStyle::NotAllowed;
}
else
// if we hit a column divider, change the mouse pointer accordingly
PointerStyle aNewPointer(PointerStyle::Arrow);
TableCell const tableCell = i_tableControl.hitTest(aPoint);
if ((tableCell.nRow == ROW_COL_HEADERS) && (tableCell.eArea == ColumnDivider))
{
aNewPointer = PointerStyle::HSplit;
}
i_tableControl.setPointer( aNewPointer );
i_tableControl.setPointer(aNewPointer);
// show tracking line
i_tableControl.hideTracking();
i_tableControl.showTracking(
tools::Rectangle(
Point( aPoint.X(), 0 ),
Size( 1, tableSize.Height() )
),
ShowTrackFlags::Split | ShowTrackFlags::TrackWindow
);
return SkipFunction; // TODO: is this correct?
}
::Size const tableSize = i_tableControl.getTableSizePixel();
// set proper pointer
PointerStyle aNewPointer(PointerStyle::Arrow);
ColumnMetrics const columnMetrics(i_tableControl.getColumnMetrics(m_nResizingColumn));
if ((aPoint.X() > tableSize.Width()) || (aPoint.X() < columnMetrics.nStartPixel))
{
aNewPointer = PointerStyle::NotAllowed;
}
else
{
aNewPointer = PointerStyle::HSplit;
}
i_tableControl.setPointer(aNewPointer);
// show tracking line
i_tableControl.hideTracking();
i_tableControl.showTracking(tools::Rectangle(Point(aPoint.X(), 0), Size(1, tableSize.Height())),
ShowTrackFlags::Split | ShowTrackFlags::TrackWindow);
return ContinueFunction;
}
FunctionResult ColumnResize::handleMouseDown(ITableControl& i_tableControl,
MouseEvent const& i_event)
{
if (m_nResizingColumn != COL_INVALID)
{
OSL_ENSURE(
false,
"ColumnResize::handleMouseDown: suspicious: MouseButtonDown while still tracking?");
return ContinueFunction;
}
FunctionResult ColumnResize::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event )
TableCell const tableCell(i_tableControl.hitTest(i_event.GetPosPixel()));
if (tableCell.nRow == ROW_COL_HEADERS)
{
if ( m_nResizingColumn != COL_INVALID )
if ((tableCell.nColumn != COL_INVALID) && (tableCell.eArea == ColumnDivider))
{
OSL_ENSURE( false, "ColumnResize::handleMouseDown: suspicious: MouseButtonDown while still tracking?" );
return ContinueFunction;
m_nResizingColumn = tableCell.nColumn;
i_tableControl.captureMouse();
return ActivateFunction;
}
TableCell const tableCell( i_tableControl.hitTest( i_event.GetPosPixel() ) );
if ( tableCell.nRow == ROW_COL_HEADERS )
{
if ( ( tableCell.nColumn != COL_INVALID )
&& ( tableCell.eArea == ColumnDivider )
)
{
m_nResizingColumn = tableCell.nColumn;
i_tableControl.captureMouse();
return ActivateFunction;
}
}
return SkipFunction;
}
return SkipFunction;
}
FunctionResult ColumnResize::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event )
FunctionResult ColumnResize::handleMouseUp(ITableControl& i_tableControl, MouseEvent const& i_event)
{
if (m_nResizingColumn == COL_INVALID)
return SkipFunction;
Point const aPoint = i_event.GetPosPixel();
i_tableControl.hideTracking();
PColumnModel const pColumn = i_tableControl.getModel()->getColumnModel(m_nResizingColumn);
tools::Long const maxWidthLogical = pColumn->getMaxWidth();
tools::Long const minWidthLogical = pColumn->getMinWidth();
// new position of mouse
tools::Long const requestedEnd = aPoint.X();
// old position of right border
tools::Long const oldEnd = i_tableControl.getColumnMetrics(m_nResizingColumn).nEndPixel;
// position of left border if cursor in the to-be-resized column
tools::Long const columnStart = i_tableControl.getColumnMetrics(m_nResizingColumn).nStartPixel;
tools::Long const requestedWidth = requestedEnd - columnStart;
// TODO: this is not correct, strictly: It assumes that the mouse was pressed exactly on the "end" pos,
// but for a while now, we have relaxed this, and allow clicking a few pixels aside, too
if (requestedEnd >= columnStart)
{
if ( m_nResizingColumn == COL_INVALID )
return SkipFunction;
Point const aPoint = i_event.GetPosPixel();
i_tableControl.hideTracking();
PColumnModel const pColumn = i_tableControl.getModel()->getColumnModel( m_nResizingColumn );
tools::Long const maxWidthLogical = pColumn->getMaxWidth();
tools::Long const minWidthLogical = pColumn->getMinWidth();
// new position of mouse
tools::Long const requestedEnd = aPoint.X();
// old position of right border
tools::Long const oldEnd = i_tableControl.getColumnMetrics( m_nResizingColumn ).nEndPixel;
// position of left border if cursor in the to-be-resized column
tools::Long const columnStart = i_tableControl.getColumnMetrics( m_nResizingColumn ).nStartPixel;
tools::Long const requestedWidth = requestedEnd - columnStart;
// TODO: this is not correct, strictly: It assumes that the mouse was pressed exactly on the "end" pos,
// but for a while now, we have relaxed this, and allow clicking a few pixels aside, too
if ( requestedEnd >= columnStart )
tools::Long requestedWidthLogical = i_tableControl.pixelWidthToAppFont(requestedWidth);
// respect column width limits
if (oldEnd > requestedEnd)
{
tools::Long requestedWidthLogical = i_tableControl.pixelWidthToAppFont( requestedWidth );
// respect column width limits
if ( oldEnd > requestedEnd )
{
// column has become smaller, check against minimum width
if ( ( minWidthLogical != 0 ) && ( requestedWidthLogical < minWidthLogical ) )
requestedWidthLogical = minWidthLogical;
}
else if ( oldEnd < requestedEnd )
{
// column has become larger, check against max width
if ( ( maxWidthLogical != 0 ) && ( requestedWidthLogical >= maxWidthLogical ) )
requestedWidthLogical = maxWidthLogical;
}
pColumn->setWidth( requestedWidthLogical );
i_tableControl.invalidate( TableArea::All );
// column has become smaller, check against minimum width
if ((minWidthLogical != 0) && (requestedWidthLogical < minWidthLogical))
requestedWidthLogical = minWidthLogical;
}
else if (oldEnd < requestedEnd)
{
// column has become larger, check against max width
if ((maxWidthLogical != 0) && (requestedWidthLogical >= maxWidthLogical))
requestedWidthLogical = maxWidthLogical;
}
pColumn->setWidth(requestedWidthLogical);
i_tableControl.invalidate(TableArea::All);
}
i_tableControl.setPointer( PointerStyle::Arrow );
i_tableControl.releaseMouse();
i_tableControl.setPointer(PointerStyle::Arrow);
i_tableControl.releaseMouse();
m_nResizingColumn = COL_INVALID;
m_nResizingColumn = COL_INVALID;
return DeactivateFunction;
}
//= RowSelection
FunctionResult RowSelection::handleMouseMove(ITableControl&, MouseEvent const&)
{
return SkipFunction;
}
FunctionResult RowSelection::handleMouseDown(ITableControl& i_tableControl,
MouseEvent const& i_event)
{
bool handled = false;
TableCell const tableCell(i_tableControl.hitTest(i_event.GetPosPixel()));
if (tableCell.nRow >= 0)
{
if (i_tableControl.getSelEngine()->GetSelectionMode() == SelectionMode::NONE)
{
i_tableControl.activateCell(tableCell.nColumn, tableCell.nRow);
handled = true;
}
else
{
handled = i_tableControl.getSelEngine()->SelMouseButtonDown(i_event);
}
}
if (handled)
m_bActive = true;
return handled ? ActivateFunction : SkipFunction;
}
FunctionResult RowSelection::handleMouseUp(ITableControl& i_tableControl, MouseEvent const& i_event)
{
TableCell const tableCell = i_tableControl.hitTest(i_event.GetPosPixel());
if (tableCell.nRow >= 0)
{
if (i_tableControl.getSelEngine()->GetSelectionMode() != SelectionMode::NONE)
{
i_tableControl.getSelEngine()->SelMouseButtonUp(i_event);
}
}
if (m_bActive)
{
m_bActive = false;
return DeactivateFunction;
}
return SkipFunction;
}
//= ColumnSortHandler
//= RowSelection
FunctionResult ColumnSortHandler::handleMouseMove(ITableControl&, MouseEvent const&)
{
return SkipFunction;
}
FunctionResult RowSelection::handleMouseMove( ITableControl&, MouseEvent const & )
FunctionResult ColumnSortHandler::handleMouseDown(ITableControl& i_tableControl,
MouseEvent const& i_event)
{
if (m_nActiveColumn != COL_INVALID)
{
OSL_ENSURE(false,
"ColumnSortHandler::handleMouseDown: called while already active - suspicious!");
return ContinueFunction;
}
if (i_tableControl.getModel()->getSortAdapter() == nullptr)
// no sorting support at the model
return SkipFunction;
}
FunctionResult RowSelection::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event )
{
bool handled = false;
TableCell const tableCell( i_tableControl.hitTest( i_event.GetPosPixel() ) );
if ( tableCell.nRow >= 0 )
{
if ( i_tableControl.getSelEngine()->GetSelectionMode() == SelectionMode::NONE )
{
i_tableControl.activateCell( tableCell.nColumn, tableCell.nRow );
handled = true;
}
else
{
handled = i_tableControl.getSelEngine()->SelMouseButtonDown( i_event );
}
}
if ( handled )
m_bActive = true;
return handled ? ActivateFunction : SkipFunction;
}
FunctionResult RowSelection::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event )
{
TableCell const tableCell = i_tableControl.hitTest( i_event.GetPosPixel() );
if ( tableCell.nRow >= 0 )
{
if ( i_tableControl.getSelEngine()->GetSelectionMode() != SelectionMode::NONE )
{
i_tableControl.getSelEngine()->SelMouseButtonUp( i_event );
}
}
if ( m_bActive )
{
m_bActive = false;
return DeactivateFunction;
}
TableCell const tableCell(i_tableControl.hitTest(i_event.GetPosPixel()));
if ((tableCell.nRow != ROW_COL_HEADERS) || (tableCell.nColumn < 0))
return SkipFunction;
}
// TODO: ensure the column header is rendered in some special way, indicating its current state
//= ColumnSortHandler
m_nActiveColumn = tableCell.nColumn;
return ActivateFunction;
}
FunctionResult ColumnSortHandler::handleMouseMove( ITableControl&, MouseEvent const & )
{
FunctionResult ColumnSortHandler::handleMouseUp(ITableControl& i_tableControl,
MouseEvent const& i_event)
{
if (m_nActiveColumn == COL_INVALID)
return SkipFunction;
}
FunctionResult ColumnSortHandler::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event )
TableCell const tableCell(i_tableControl.hitTest(i_event.GetPosPixel()));
if ((tableCell.nRow == ROW_COL_HEADERS) && (tableCell.nColumn == m_nActiveColumn))
{
if ( m_nActiveColumn != COL_INVALID )
{
OSL_ENSURE( false, "ColumnSortHandler::handleMouseDown: called while already active - suspicious!" );
return ContinueFunction;
}
ITableDataSort* pSort = i_tableControl.getModel()->getSortAdapter();
ENSURE_OR_RETURN(pSort != nullptr,
"ColumnSortHandler::handleMouseUp: somebody is mocking with us!",
DeactivateFunction);
// in handleMousButtonDown, the model claimed to have sort support ...
if ( i_tableControl.getModel()->getSortAdapter() == nullptr )
// no sorting support at the model
return SkipFunction;
ColumnSortDirection eSortDirection = ColumnSortAscending;
ColumnSort const aCurrentSort = pSort->getCurrentSortOrder();
if (aCurrentSort.nColumnPos == m_nActiveColumn)
// invert existing sort order
eSortDirection = (aCurrentSort.eSortDirection == ColumnSortAscending)
? ColumnSortDescending
: ColumnSortAscending;
TableCell const tableCell( i_tableControl.hitTest( i_event.GetPosPixel() ) );
if ( ( tableCell.nRow != ROW_COL_HEADERS ) || ( tableCell.nColumn < 0 ) )
return SkipFunction;
// TODO: ensure the column header is rendered in some special way, indicating its current state
m_nActiveColumn = tableCell.nColumn;
return ActivateFunction;
}
FunctionResult ColumnSortHandler::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event )
{
if ( m_nActiveColumn == COL_INVALID )
return SkipFunction;
TableCell const tableCell( i_tableControl.hitTest( i_event.GetPosPixel() ) );
if ( ( tableCell.nRow == ROW_COL_HEADERS ) && ( tableCell.nColumn == m_nActiveColumn ) )
{
ITableDataSort* pSort = i_tableControl.getModel()->getSortAdapter();
ENSURE_OR_RETURN( pSort != nullptr, "ColumnSortHandler::handleMouseUp: somebody is mocking with us!", DeactivateFunction );
// in handleMousButtonDown, the model claimed to have sort support ...
ColumnSortDirection eSortDirection = ColumnSortAscending;
ColumnSort const aCurrentSort = pSort->getCurrentSortOrder();
if ( aCurrentSort.nColumnPos == m_nActiveColumn )
// invert existing sort order
eSortDirection = ( aCurrentSort.eSortDirection == ColumnSortAscending ) ? ColumnSortDescending : ColumnSortAscending;
pSort->sortByColumn( m_nActiveColumn, eSortDirection );
}
m_nActiveColumn = COL_INVALID;
return DeactivateFunction;
pSort->sortByColumn(m_nActiveColumn, eSortDirection);
}
m_nActiveColumn = COL_INVALID;
return DeactivateFunction;
}
} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */