From 94af9087b00cdc95ccde9b10ed31466109fbcb11 Mon Sep 17 00:00:00 2001 From: Alexandre Deckner Date: Mon, 13 Jun 2011 00:12:43 +0000 Subject: [PATCH] * Fix #6548. Don't initially Hide() if already hidden, otherwise the showlevel would never get a chance be visible again. When instanciated from an archive, a BDragger restores its BView::fShowLevel and thus can already be hidden if archived while hidden. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42137 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Dragger.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kits/interface/Dragger.cpp b/src/kits/interface/Dragger.cpp index 5712b4444a..5b3644e6e1 100644 --- a/src/kits/interface/Dragger.cpp +++ b/src/kits/interface/Dragger.cpp @@ -319,9 +319,9 @@ BDragger::MessageReceived(BMessage *msg) fTransition = false; } else { if ((fShelf && (fShelf->AllowsDragging() && AreDraggersDrawn())) - || AreDraggersDrawn()) + || AreDraggersDrawn()) { Show(); - else + } else Hide(); } break; @@ -629,7 +629,7 @@ BDragger::_InitData() { fBitmap = new BBitmap(BRect(0.0f, 0.0f, 7.0f, 7.0f), B_CMAP8, false, false); fBitmap->SetBits(kHandBitmap, fBitmap->BitsLength(), 0, B_CMAP8); - + // we need to translate some strings, and in order to do so, we need // to use the LocaleBackend to reach liblocale.so if (gLocaleBackend == NULL) @@ -652,7 +652,7 @@ BDragger::_AddToList() // The dragger is not shown - but we can't hide us in case we're the // parent of the actual target view (because then you couldn't see // it anymore). - if (fRelation != TARGET_IS_CHILD) + if (fRelation != TARGET_IS_CHILD && !IsHidden()) Hide(); } }