From 50e1bac05a4c9f492cc8b45796138a5130e3fc86 Mon Sep 17 00:00:00 2001 From: Akshay Deep Date: Mon, 30 May 2016 03:37:11 +0530 Subject: Remove inline renaming of title in ThumbnailViewItem Change-Id: I8fa2cae3390dd1576aab531bc826b8bb5985eaf9 Reviewed-on: https://gerrit.libreoffice.org/25645 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit b660074d50acf7befed44c5ed770188b8f3077ec) Reviewed-on: https://gerrit.libreoffice.org/25714 Reviewed-by: Akshay Deep Tested-by: Akshay Deep --- sfx2/source/control/recentdocsviewitem.cxx | 7 -- sfx2/source/control/templatelocalview.cxx | 3 +- sfx2/source/control/thumbnailview.cxx | 7 -- sfx2/source/control/thumbnailviewitem.cxx | 112 +---------------------------- 4 files changed, 2 insertions(+), 127 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index 1e0abecedcea..0d353700bd7c 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -101,13 +101,6 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR maPreview1 = TemplateAbstractView::scaleImg(aThumbnail, nThumbnailSize, nThumbnailSize); } -void RecentDocsViewItem::setEditTitle (bool edit, bool bChangeFocus) -{ - // Unused parameters. - (void)edit; - (void)bChangeFocus; -} - Rectangle RecentDocsViewItem::updateHighlight(bool bVisible, const Point& rPoint) { Rectangle aRect(ThumbnailViewItem::updateHighlight(bVisible, rPoint)); diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index c28e66580310..6c826bf42f88 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -213,7 +213,7 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) case MNI_RENAME: { ScopedVclPtrInstance< InputDialog > m_pTitleEditDlg( SfxResId(STR_RENAME_TEMPLATE).toString(), this); - OUString sOldTitle = maSelectedItem->getHelpText(); + OUString sOldTitle = maSelectedItem->getTitle(); m_pTitleEditDlg->SetEntryText( sOldTitle ); m_pTitleEditDlg->HideHelpBtn(); @@ -224,7 +224,6 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) if ( !sNewTitle.isEmpty() && sNewTitle != sOldTitle ) { maSelectedItem->setTitle(sNewTitle); - maSelectedItem->setEditTitle(true); } } break; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 894db1e56cd5..7a501ea9d977 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -799,12 +799,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) mpStartSelRange = mFilteredItemList.begin() + nPos; } - if (pItem->isSelected()) - { - bool bClickOnTitle = pItem->getTextArea().IsInside(rMEvt.GetPosPixel()); - pItem->setEditTitle(bClickOnTitle); - } - if (!pItem->isHighlighted()) DrawItem(pItem); @@ -1146,7 +1140,6 @@ void ThumbnailView::deselectItems() { if (p->isSelected()) { - p->setEditTitle(false); p->setSelection(false); maItemStateHdl.Call(p); diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index c41ba8cf5409..0e36b29a9bec 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -44,62 +44,6 @@ using namespace ::com::sun::star; using namespace drawinglayer::attribute; using namespace drawinglayer::primitive2d; -class ResizableMultiLineEdit : public VclMultiLineEdit -{ - private: - ThumbnailViewItem* mpItem; - bool mbIsInGrabFocus; - - public: - ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem); - - void SetInGrabFocus(bool bInGrabFocus) { mbIsInGrabFocus = bInGrabFocus; } - - virtual bool PreNotify(NotifyEvent& rNEvt) override; - virtual void Modify() override; -}; - -ResizableMultiLineEdit::ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem) : - VclMultiLineEdit (pParent, WB_CENTER | WB_BORDER), - mpItem(pItem), - mbIsInGrabFocus(false) -{ -} - -bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) -{ - bool bDone = false; - if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) - { - const KeyEvent& rKEvt = *rNEvt.GetKeyEvent(); - vcl::KeyCode aCode = rKEvt.GetKeyCode(); - switch (aCode.GetCode()) - { - case KEY_RETURN: - mpItem->setTitle( GetText() ); - SAL_FALLTHROUGH; - case KEY_ESCAPE: - mpItem->setEditTitle(false); - bDone = true; - break; - default: - break; - } - } - else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !mbIsInGrabFocus ) - { - mpItem->setTitle( GetText() ); - mpItem->setEditTitle(false, false); - } - return bDone || VclMultiLineEdit::PreNotify(rNEvt); -} - -void ResizableMultiLineEdit::Modify() -{ - VclMultiLineEdit::Modify(); - mpItem->updateTitleEditSize(); -} - ThumbnailViewItem::ThumbnailViewItem(ThumbnailView &rView, sal_uInt16 nId) : mrParent(rView) , mnId(nId) @@ -107,16 +51,11 @@ ThumbnailViewItem::ThumbnailViewItem(ThumbnailView &rView, sal_uInt16 nId) , mbSelected(false) , mbHover(false) , mxAcc() - , mbEditTitle(false) - , mpTitleED(nullptr) - , maTextEditMaxArea() { - mpTitleED = VclPtr::Create(&rView, this); } ThumbnailViewItem::~ThumbnailViewItem() { - mpTitleED.disposeAndClear(); if( mxAcc.is() ) { static_cast< ThumbnailViewItemAcc* >( mxAcc.get() )->ParentDestroyed(); @@ -126,8 +65,6 @@ ThumbnailViewItem::~ThumbnailViewItem() void ThumbnailViewItem::show (bool bVisible) { mbVisible = bVisible; - if (!mbVisible) - mpTitleED->Show(false); } void ThumbnailViewItem::setSelection (bool state) @@ -152,7 +89,7 @@ Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, const Point& rPoint) } else { - if (isHighlighted() || mpTitleED->SupportsDoubleBuffering()) + if (isHighlighted()) bNeedsPaint = true; setHighlight(false); } @@ -163,47 +100,6 @@ Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, const Point& rPoint) return Rectangle(); } -void ThumbnailViewItem::setEditTitle (bool edit, bool bChangeFocus) -{ - mbEditTitle = edit; - mpTitleED->Show(edit); - if (edit) - { - mpTitleED->SetText(maTitle); - updateTitleEditSize(); - static_cast(mpTitleED.get())->SetInGrabFocus(true); - mpTitleED->GrabFocus(); - static_cast(mpTitleED.get())->SetInGrabFocus(false); - } - else if (bChangeFocus) - { - mrParent.GrabFocus(); - } -} - -Rectangle ThumbnailViewItem::getTextArea() const -{ - Rectangle aTextArea(maTextEditMaxArea); - - TextEngine aTextEngine; - aTextEngine.SetMaxTextWidth(maDrawArea.getWidth()); - aTextEngine.SetText(maTitle); - - long nTxtHeight = aTextEngine.GetTextHeight() + 6; - if (nTxtHeight < aTextArea.GetHeight()) - aTextArea.SetSize(Size(aTextArea.GetWidth(), nTxtHeight)); - - return aTextArea; -} - -void ThumbnailViewItem::updateTitleEditSize() -{ - Rectangle aTextArea = getTextArea(); - Point aPos = aTextArea.TopLeft(); - Size aSize = aTextArea.GetSize(); - mpTitleED->SetPosSizePixel(aPos, aSize); -} - void ThumbnailViewItem::setTitle (const OUString& rTitle) { if (mrParent.renameItem(this, rTitle)) @@ -245,12 +141,6 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con aPos.Y() = maDrawArea.getY() + nThumbnailHeight + nPadding * 2; aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2; maTextPos = aPos; - - // Calculate the text edit max area - aPos = Point(maDrawArea.getX() + nPadding, maTextPos.getY()); - Size aEditSize(maDrawArea.GetWidth() - nPadding * 2, - maDrawArea.Bottom() - maTextPos.Y()); - maTextEditMaxArea = Rectangle( aPos, aEditSize ); } void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, -- cgit v1.2.3