Kaydet (Commit) 369cb8e2 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat Kaydeden (comit) Miklos Vajna

fdo#61390: allow arrow keys to show hidden thumbnail items

Change-Id: I70924b4c9578122a1c5a5b6c8a67889d6d003a2e
(cherry picked from commit cc599e91)
Reviewed-on: https://gerrit.libreoffice.org/3033Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
Tested-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst 2902a836
......@@ -277,6 +277,7 @@ protected:
using Window::ImplInit;
void CalculateItemPositions ();
void MakeItemVisible( sal_uInt16 nId );
SFX2_DLLPRIVATE void ImplInit();
SFX2_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
......
......@@ -553,13 +553,40 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt )
Control::KeyInput( rKEvt );
}
if ( pNext && pNext->isVisible() )
if ( pNext )
{
deselectItems();
SelectItem(pNext->mnId);
MakeItemVisible(pNext->mnId);
}
}
void ThumbnailView::MakeItemVisible( sal_uInt16 nItemId )
{
// Get the item row
size_t nPos = 0;
bool bFound = false;
for ( size_t i = 0; !bFound && i < mFilteredItemList.size(); ++i )
{
ThumbnailViewItem* pItem = mFilteredItemList[i];
if ( pItem->mnId == nItemId )
{
nPos = i;
bFound = true;
}
}
sal_uInt16 nRow = nPos / mnCols;
// Move the visible rows as little as possible to include that one
if ( nRow < mnFirstLine )
mnFirstLine = nRow;
else if ( nRow > mnFirstLine + mnVisLines )
mnFirstLine = nRow - mnVisLines;
CalculateItemPositions();
Invalidate();
}
void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeft() )
......@@ -703,11 +730,11 @@ void ThumbnailView::LoseFocus()
void ThumbnailView::Resize()
{
Control::Resize();
CalculateItemPositions();
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
Control::Resize();
}
void ThumbnailView::StateChanged( StateChangedType nType )
......
......@@ -331,7 +331,7 @@ void SfxTemplateManagerDlg::Resize()
Point aViewPos = maView->GetPosPixel();
aViewPos.setY(nToolbarsHeight);
aViewPos.setX(0);
Size aThumbSize(aWinSize.getWidth(), maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY());
Size aThumbSize(aWinSize.getWidth(), maTabControl.GetTabPageSizePixel().getHeight() - aViewPos.getY());
maView->SetPosSizePixel(aViewPos, aThumbSize);
if (aWinSize.getHeight() < aViewPos.getY() + aThumbSize.getHeight() + PADDING_DLG_BORDER)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment