diff options
author | Gergo Mocsi <gmocsi91@gmail.com> | 2013-07-31 17:08:18 +0200 |
---|---|---|
committer | Gergo Mocsi <gmocsi91@gmail.com> | 2013-07-31 17:08:18 +0200 |
commit | bc7e841728c820de6d2fade0c052e53da4a87bcf (patch) | |
tree | e776da9fe4082e8a9db411cd4e9c302e45ed8e7b /basctl/source/basicide/baside2b.cxx | |
parent | cbe6c15c676641a51c5504613eb939fec846e670 (diff) |
GSOC work, ListBox appearance fix (at the borders) + code fixes
ListBox appearance fixed at the borders:
a) bottom: it it placed over the current line (not under)
b) right side: listbox's right side is adjusted to the window's right side
Coed fixes:
CodeCompleteOptions now intializes itself from the configuration file BasicIDE.xcs
Added a checkbox for enabling extended types in the options dialog.
Cursor is visible when the listbox is active.
Fixed the small issue when deleting a character.
Change-Id: I68b80143de245cebfce65cdd8af37ea4694aa81b
Diffstat (limited to 'basctl/source/basicide/baside2b.cxx')
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 3aebafdfa0e3..7b550ba388e4 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -746,6 +746,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) pCodeCompleteWnd->Show(); pCodeCompleteWnd->ResizeListBox(); pCodeCompleteWnd->SelectFirstEntry(); + pEditView->GetWindow()->GrabFocus(); } } } @@ -2605,7 +2606,7 @@ long CodeCompleteListBox::PreNotify( NotifyEvent& rNEvt ) { TextPaM aEnd(pCodeCompleteWindow->aTextSelection.GetEnd().GetPara(), pCodeCompleteWindow->GetTextSelection().GetEnd().GetIndex() + aFuncBuffer.getLength()); TextPaM aStart(pCodeCompleteWindow->aTextSelection.GetEnd().GetPara(), pCodeCompleteWindow->GetTextSelection().GetEnd().GetIndex() + aFuncBuffer.getLength()-1); - aFuncBuffer.stripEnd(aFuncBuffer[aFuncBuffer.getLength()-1]); + aFuncBuffer = aFuncBuffer.remove(aFuncBuffer.getLength()-1, 1); pCodeCompleteWindow->pParent->GetEditView()->SetSelection(TextSelection(aStart, aEnd)); pCodeCompleteWindow->pParent->GetEditView()->DeleteSelected(); SetVisibleEntries(); @@ -2689,9 +2690,27 @@ void CodeCompleteWindow::ResizeListBox() Size aSize = pListBox->CalcSize( aLongestEntry.getLength(), std::min( (sal_uInt16) 4, pListBox->GetEntryCount()) ); const Font& aFont = pListBox->GetUnzoomedControlPointFont(); + Rectangle aVisArea( pParent->GetEditView()->GetStartDocPos(), pParent->GetOutputSizePixel() ); aSize.setHeight( aFont.GetSize().getHeight() * 16 ); aSize.setWidth( pListBox->CalcSize(aLongestEntry.getLength(), pListBox->GetEntryCount()).getWidth() ); - + Point aBottomPoint = aVisArea.BottomRight(); + Point aTopPoint = aVisArea.TopRight(); + long nYDiff = std::abs((aBottomPoint.Y() - aTopPoint.Y()) - GetPosPixel().Y()); + + if( (nYDiff + aFont.GetSize().getHeight()) < aSize.Height() ) + {//bottom part is clipped, fix the visibility by placing it over the line (not under) + //std::cerr << "clipped at the bottom" << std::endl; + Point aPos = GetPosPixel(); + aPos.Y() = aPos.Y() - (aSize.getHeight() + aFont.GetSize().getHeight()); + SetPosPixel(aPos); + } + long nXDiff = std::abs(aTopPoint.X() - GetPosPixel().X()); + if( nXDiff < aSize.Width() ) + {//clipped at the right side, move it a bit left + Point aPos = GetPosPixel(); + aPos.X() = aPos.X() - aSize.Width() + nXDiff; + SetPosPixel(aPos); + } pListBox->SetSizePixel( aSize ); aSize.setWidth( aSize.getWidth() + 1 ); aSize.setHeight( aSize.getHeight() + 1 ); |