From 9b4593e3a05a777a0451d956f31954a16f6f1c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 28 Jul 2009 13:37:42 +0000 Subject: [PATCH] * Fixed some problems of the dynamic layout, basically, the upper part of the window will now stay fixed when you expand the optional packages and collapse them again. * Updated the text about having prepared a partition, since we can now indeed create and delete partitions. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31844 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/installer/InstallerApp.cpp | 19 +++++++++++-------- src/apps/installer/InstallerWindow.cpp | 3 ++- src/apps/installer/PackageViews.cpp | 3 +++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp index 8dda7965ec..4a1bf1b2cf 100644 --- a/src/apps/installer/InstallerApp.cpp +++ b/src/apps/installer/InstallerApp.cpp @@ -42,20 +42,23 @@ static const uint32 kMsgAgree = 'agre'; static const char* kInfoText = +"Welcome to the Haiku Installer!\n\n" + "IMPORTANT INFORMATION BEFORE INSTALLING HAIKU\n\n" "This is alpha-quality software! It means there is a high risk of losing " "important data. Make frequent backups! You have been warned.\n\n" "1) If you are installing Haiku onto real hardware (not inside an emulator) " -"you need to have prepared a harddisk partition. The Installer and the " -"DriveSetup tool will only offer to initialize existing partitions with the " -"Haiku native filesystem. We recommend using the GParted Live-CD, it can also " -"resize partitions to make room. We do not feel confident in enabling our own " -"code to mess with your harddisk partition table. If you have not created a " -"partition yet, simply reboot, create the partition using whatever tool you " -"feel most comfortable with, and reboot into Haiku to continue with the " -"installation.\n\n" +"it is recommended that you have already prepared a hard disk partition. The " +"Installer and the DriveSetup tool offer to initialize existing partitions " +"with the Haiku native filesystem, but the options to change the actual " +"partition layout may not have been tested on a sufficiently great variaty of " +"computer installations so we do not recommend using it.\n" +"If you have not created a partition yet, simply reboot, create the partition " +"using whatever tool you feel most comfortable with, and reboot into Haiku to " +"continue with the installation. You could for example use the GParted " +"Live-CD, it can also resize existing partitions to make room.\n\n" "2) The Installer will take no steps to integrate Haiku into an existig boot " "menu. The Haiku partition itself will be made bootable. If you have GRUB " diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 89d0cfd179..e83448148a 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -222,6 +222,7 @@ InstallerWindow::InstallerWindow() fStatusView->MakeSelectable(false); BSize logoSize = logoView->MinSize(); + logoView->SetExplicitMaxSize(logoSize); fStatusView->SetExplicitMinSize(BSize(logoSize.width * 0.66, B_SIZE_UNSET)); fDestMenu = new BPopUpMenu("scanning" B_UTF8_ELLIPSIS, true, false); @@ -239,7 +240,7 @@ InstallerWindow::InstallerWindow() "Show Optional Packages"); fPackagesSwitch->SetMessage(new BMessage(SHOW_BOTTOM_MESSAGE)); fPackagesSwitch->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, - B_SIZE_UNLIMITED)); + B_SIZE_UNSET)); fPackagesSwitch->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP)); diff --git a/src/apps/installer/PackageViews.cpp b/src/apps/installer/PackageViews.cpp index 2b0f7385fa..a491ad8383 100644 --- a/src/apps/installer/PackageViews.cpp +++ b/src/apps/installer/PackageViews.cpp @@ -305,6 +305,9 @@ PackagesView::GetPackagesToInstall(BList *list, int32 *size) void PackagesView::FrameResized(float width, float height) { + if (CountChildren() == 0) + Invalidate(); + BScrollBar* scrollBar = ScrollBar(B_VERTICAL); if (scrollBar == NULL) return;