HaikuDepot: Show message when no package is selected.

the instable layout was irritating. Clicking a package and having the
package info area expand upward could even lead to the clicked packed
to be hidden in the listview. Now a message is displayed and the package
info area already has the correct height.
This commit is contained in:
Stephan Aßmus
2013-12-08 14:17:06 +01:00
parent 1aa7edf0c3
commit d543cbfcf6
2 changed files with 30 additions and 8 deletions
+27 -7
View File
@@ -1303,17 +1303,39 @@ private:
PackageInfoView::PackageInfoView(BLocker* modelLock, PackageInfoView::PackageInfoView(BLocker* modelLock,
PackageActionHandler* handler) PackageActionHandler* handler)
: :
BGroupView("package info view", B_VERTICAL), BView("package info view", 0),
fModelLock(modelLock), fModelLock(modelLock),
fPackageListener(new(std::nothrow) Listener(this)) fPackageListener(new(std::nothrow) Listener(this))
{ {
fCardLayout = new BCardLayout();
SetLayout(fCardLayout);
BGroupView* noPackageCard = new BGroupView("no package card", B_VERTICAL);
AddChild(noPackageCard);
BStringView* noPackageView = new BStringView("no package view",
B_TRANSLATE("Click a package to view information"));
noPackageView->SetHighColor(kLightBlack);
noPackageView->SetExplicitAlignment(BAlignment(
B_ALIGN_HORIZONTAL_CENTER, B_ALIGN_VERTICAL_CENTER));
BLayoutBuilder::Group<>(noPackageCard)
.Add(noPackageView)
.SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED))
;
BGroupView* packageCard = new BGroupView("package card", B_VERTICAL);
AddChild(packageCard);
fCardLayout->SetVisibleItem(0L);
fTitleView = new TitleView(); fTitleView = new TitleView();
fPackageActionView = new PackageActionView(handler); fPackageActionView = new PackageActionView(handler);
fPackageActionView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, fPackageActionView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
B_SIZE_UNSET)); B_SIZE_UNSET));
fPagesView = new PagesView(); fPagesView = new PagesView();
BLayoutBuilder::Group<>(this) BLayoutBuilder::Group<>(packageCard)
.AddGroup(B_HORIZONTAL, 0.0f) .AddGroup(B_HORIZONTAL, 0.0f)
.Add(fTitleView, 6.0f) .Add(fTitleView, 6.0f)
.Add(fPackageActionView, 1.0f) .Add(fPackageActionView, 1.0f)
@@ -1378,7 +1400,7 @@ PackageInfoView::MessageReceived(BMessage* message)
break; break;
} }
default: default:
BGroupView::MessageReceived(message); BView::MessageReceived(message);
break; break;
} }
} }
@@ -1395,8 +1417,7 @@ PackageInfoView::SetPackage(const PackageInfoRef& packageRef)
fPackageActionView->SetPackage(package); fPackageActionView->SetPackage(package);
fPagesView->SetPackage(package); fPagesView->SetPackage(package);
if (fPagesView->IsHidden(fPagesView)) fCardLayout->SetVisibleItem(1L);
fPagesView->Show();
fPackageListener->SetPackage(packageRef); fPackageListener->SetPackage(packageRef);
} }
@@ -1409,8 +1430,7 @@ PackageInfoView::Clear()
fPackageActionView->Clear(); fPackageActionView->Clear();
fPagesView->Clear(); fPagesView->Clear();
if (!fPagesView->IsHidden(fPagesView)) fCardLayout->SetVisibleItem(0L);
fPagesView->Hide();
BAutolock _(fModelLock); BAutolock _(fModelLock);
+3 -1
View File
@@ -11,6 +11,7 @@
#include "PackageInfoListener.h" #include "PackageInfoListener.h"
class BCardLayout;
class BLocker; class BLocker;
class TitleView; class TitleView;
class PackageActionHandler; class PackageActionHandler;
@@ -23,7 +24,7 @@ enum {
}; };
class PackageInfoView : public BGroupView { class PackageInfoView : public BView {
public: public:
PackageInfoView(BLocker* modelLock, PackageInfoView(BLocker* modelLock,
PackageActionHandler* handler); PackageActionHandler* handler);
@@ -41,6 +42,7 @@ private:
private: private:
BLocker* fModelLock; BLocker* fModelLock;
BCardLayout* fCardLayout;
TitleView* fTitleView; TitleView* fTitleView;
PackageActionView* fPackageActionView; PackageActionView* fPackageActionView;
PagesView* fPagesView; PagesView* fPagesView;