From 5dff42570ec6fd50968d25286a67de64a6166248 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 7 Sep 2012 00:34:00 +0000 Subject: [PATCH] VM Preflet: Center properly on screen * On first run, dialog was at 0,0 * Rename window location/settings file from VM_data to virtualmemory_preferences --- src/preferences/virtualmemory/Settings.cpp | 2 +- src/preferences/virtualmemory/SettingsWindow.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/preferences/virtualmemory/Settings.cpp b/src/preferences/virtualmemory/Settings.cpp index 23bfc351df..f0c1f645db 100644 --- a/src/preferences/virtualmemory/Settings.cpp +++ b/src/preferences/virtualmemory/Settings.cpp @@ -25,7 +25,7 @@ #include -static const char* const kWindowSettingsFile = "VM_data"; +static const char* const kWindowSettingsFile = "virtualmemory_preferences"; static const char* const kVirtualMemorySettings = "virtual_memory"; static const off_t kMegaByte = 1024 * 1024; diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp index 4acdc46e89..6cae509dca 100644 --- a/src/preferences/virtualmemory/SettingsWindow.cpp +++ b/src/preferences/virtualmemory/SettingsWindow.cpp @@ -126,10 +126,10 @@ SettingsWindow::SettingsWindow() gBootDev = dev_for_path("/boot"); BAlignment align(B_ALIGN_LEFT, B_ALIGN_MIDDLE); - if (fSettings.ReadWindowSettings() == B_OK) - MoveTo(fSettings.WindowPosition()); - else + if (fSettings.ReadWindowSettings() != B_OK) CenterOnScreen(); + else + MoveTo(fSettings.WindowPosition()); status_t result = fSettings.ReadSwapSettings(); if (result == kErrorSettingsNotFound) @@ -243,8 +243,6 @@ SettingsWindow::SettingsWindow() BRect screenFrame = screen.Frame(); if (!screenFrame.Contains(fSettings.WindowPosition())) CenterOnScreen(); - else - MoveTo(fSettings.WindowPosition()); #ifdef SWAP_VOLUME_IMPLEMENTED // Validate the volume specified in settings file