Skip to content

Commit bfc73c2

Browse files
committed
don't show thumbnails UI in Documents Mode + fix thumbnails UI position in Board Mode
1 parent 0902a0a commit bfc73c2

1 file changed

Lines changed: 24 additions & 3 deletions

File tree

src/gui/UBThumbnail.cpp

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "board/UBDrawingController.h"
2929
#include "document/UBDocument.h"
3030
#include "domain/UBGraphicsScene.h"
31+
#include "gui/UBBoardThumbnailsView.h"
3132
#include "gui/UBDocumentThumbnailsView.h"
3233
#include "gui/UBThumbnailScene.h"
3334

@@ -247,7 +248,24 @@ QVariant UBThumbnail::itemChange(GraphicsItemChange change, const QVariant& valu
247248

248249
void UBThumbnail::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
249250
{
250-
mEditable = true;
251+
auto thumbnailScene = dynamic_cast<UBThumbnailScene*>(scene());
252+
253+
if (thumbnailScene)
254+
{
255+
for (const auto view : thumbnailScene->views())
256+
{
257+
if (view->isVisible())
258+
{
259+
bool isBoardThumbnailsView = dynamic_cast<UBBoardThumbnailsView*>(view) != nullptr;
260+
261+
if (isBoardThumbnailsView)
262+
{
263+
mEditable = true;
264+
break;
265+
}
266+
}
267+
}
268+
}
251269
QGraphicsRectItem::hoverEnterEvent(event);
252270
}
253271

@@ -296,8 +314,11 @@ void UBThumbnail::paint(QPainter* painter, const QStyleOptionGraphicsItem* optio
296314
// paint the buttons
297315
if (mEditable)
298316
{
299-
UBThumbnailUI::draw(painter, *UBThumbnailUI::getIcon(mDeletable ? "close" : "closeDisabled"));
300-
UBThumbnailUI::draw(painter, *UBThumbnailUI::getIcon("duplicate"));
317+
using namespace UBThumbnailUI; //should be reworked so icons' scale adapts to what's needed
318+
const UBThumbnailUIIcon& closeThumbnailIcon = *UBThumbnailUI::getIcon(mDeletable ? "close" : "closeDisabled");
319+
const UBThumbnailUIIcon& duplicateThumbnailIcon = *UBThumbnailUI::getIcon("duplicate");
320+
painter->drawPixmap(mPixmapItem->x() + (closeThumbnailIcon.pos() * (ICONSIZE + ICONSPACING)), 0, ICONSIZE, ICONSIZE, closeThumbnailIcon);
321+
painter->drawPixmap(mPixmapItem->x() + (duplicateThumbnailIcon.pos() * (ICONSIZE + ICONSPACING)), 0, ICONSIZE, ICONSIZE, duplicateThumbnailIcon);
301322
}
302323

303324
// do not call superclass - do not paint the rectangle itself or the default dashed selection rectangle

0 commit comments

Comments
 (0)