From b92e2c086f7df99f8fe66464d4a4208a1b933c88 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 29 Aug 2015 10:04:12 +0200 Subject: [PATCH] keystore_server: Resize request windows to preferred size. Long application signatures and paths could previously take up too much space, causing the buttons to be cut off or become completely invisible. Actually fixes #11367. --- src/servers/keystore/AppAccessRequestWindow.cpp | 3 ++- src/servers/keystore/KeyRequestWindow.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/servers/keystore/AppAccessRequestWindow.cpp b/src/servers/keystore/AppAccessRequestWindow.cpp index 1a0292afc9..c05b29b006 100644 --- a/src/servers/keystore/AppAccessRequestWindow.cpp +++ b/src/servers/keystore/AppAccessRequestWindow.cpp @@ -142,7 +142,7 @@ AppAccessRequestWindow::AppAccessRequestWindow(const char* keyringName, const char* signature, const char* path, const char* accessString, bool appIsNew, bool appWasUpdated) : - BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Application keyring access"), + BWindow(BRect(50, 50, 100, 100), B_TRANSLATE("Application keyring access"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS), fRequestView(NULL), @@ -208,6 +208,7 @@ AppAccessRequestWindow::MessageReceived(BMessage* message) status_t AppAccessRequestWindow::RequestAppAccess(bool& allowAlways) { + ResizeToPreferred(); CenterOnScreen(); Show(); diff --git a/src/servers/keystore/KeyRequestWindow.cpp b/src/servers/keystore/KeyRequestWindow.cpp index 76466577da..2105a8caf7 100644 --- a/src/servers/keystore/KeyRequestWindow.cpp +++ b/src/servers/keystore/KeyRequestWindow.cpp @@ -152,7 +152,7 @@ private: KeyRequestWindow::KeyRequestWindow() : - BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Unlock keyring"), + BWindow(BRect(50, 50, 100, 100), B_TRANSLATE("Unlock keyring"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS), fRequestView(NULL), @@ -218,6 +218,7 @@ KeyRequestWindow::RequestKey(const BString& keyringName, BMessage& keyMessage) { fRequestView->SetUp(keyringName); + ResizeToPreferred(); CenterOnScreen(); Show();