hrev46527 adds 1 changeset to branch 'master' old head: 07d157db549c536dcf3450f73db36ba4f7c020ec new head: 372072c899b83235838fe0c70e68e2aadf243f9e overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=372072c+%5E07d157d ---------------------------------------------------------------------------- 372072c: StyledEdit/DiskUsage/DriveSetup post-hrev46520 fixes * StyledEdit - make Find/Replace windows non zoomable, select the search string view on showing the window for repetitional search; * Devices - fix plain property list background - to standard one and restore read-only state of this pane; * DriveSetup - remove radio-mode of drive list context popup menu; * DiskUsage - SetLowColor to parent background to avoid small text rendering issue. Many thanks to Sergei Reznikov for testing and pointing issues out. [ Siarzhuk Zharski <zharik@xxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev46527 Commit: 372072c899b83235838fe0c70e68e2aadf243f9e URL: http://cgit.haiku-os.org/haiku/commit/?id=372072c Author: Siarzhuk Zharski <zharik@xxxxxx> Date: Wed Dec 11 19:35:47 2013 UTC ---------------------------------------------------------------------------- 7 files changed, 29 insertions(+), 6 deletions(-) src/apps/devices/PropertyListPlain.cpp | 3 +++ src/apps/diskusage/PieView.cpp | 4 +++- src/apps/drivesetup/MainWindow.cpp | 2 +- src/apps/stylededit/FindWindow.cpp | 12 ++++++++++-- src/apps/stylededit/FindWindow.h | 1 + src/apps/stylededit/ReplaceWindow.cpp | 12 ++++++++++-- src/apps/stylededit/ReplaceWindow.h | 1 + ---------------------------------------------------------------------------- diff --git a/src/apps/devices/PropertyListPlain.cpp b/src/apps/devices/PropertyListPlain.cpp index 39a9948..44d1d03 100644 --- a/src/apps/devices/PropertyListPlain.cpp +++ b/src/apps/devices/PropertyListPlain.cpp @@ -45,6 +45,9 @@ PropertyListPlain::AddAttributes(const Attributes& attributes) BTextView* view = new BTextView(BRect(0, 0, 1000, 1000), "", BRect(5, 5, 995, 995), B_FOLLOW_ALL_SIDES); + view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + view->MakeEditable(false); + for (unsigned int i = 0; i < attributes.size(); i++) { BString attributeLine; attributeLine << attributes[i].fName diff --git a/src/apps/diskusage/PieView.cpp b/src/apps/diskusage/PieView.cpp index a7e1da8..a20bc9f 100644 --- a/src/apps/diskusage/PieView.cpp +++ b/src/apps/diskusage/PieView.cpp @@ -166,8 +166,10 @@ void PieView::AttachedToWindow() { fWindow = (MainWindow*)Window(); - if (Parent()) + if (Parent()) { SetViewColor(Parent()->ViewColor()); + SetLowColor(Parent()->ViewColor()); + } } diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 682a362..94b6115 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -273,7 +273,7 @@ MainWindow::MainWindow() AddChild(fMenuBar); // Partition / Drives context menu - fContextMenu = new BPopUpMenu("Partition"); + fContextMenu = new BPopUpMenu("Partition", false, false); fCreateContextMenuItem = new BMenuItem(B_TRANSLATE("Create" B_UTF8_ELLIPSIS), new BMessage(MSG_CREATE), 'C'); fChangeContextMenuItem = new BMenuItem( diff --git a/src/apps/stylededit/FindWindow.cpp b/src/apps/stylededit/FindWindow.cpp index 368d146..cde9f1f 100644 --- a/src/apps/stylededit/FindWindow.cpp +++ b/src/apps/stylededit/FindWindow.cpp @@ -29,8 +29,8 @@ FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString, bool caseState, bool wrapState, bool backState) : BWindow(frame, B_TRANSLATE("Find"), B_FLOATING_WINDOW, - B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS, - B_CURRENT_WORKSPACE) + B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS + | B_AUTO_UPDATE_SIZE_LIMITS, B_CURRENT_WORKSPACE) { AddShortcut('W', B_COMMAND_KEY, new BMessage(MSG_HIDE_WINDOW)); @@ -111,6 +111,14 @@ FindWindow::DispatchMessage(BMessage* message, BHandler* handler) void +FindWindow::Show() +{ + fSearchString->TextView()->SelectAll(); + BWindow::Show(); +} + + +void FindWindow::_SendMessage() { BMessage message(MSG_SEARCH); diff --git a/src/apps/stylededit/FindWindow.h b/src/apps/stylededit/FindWindow.h index d734d0f..f891bf5 100644 --- a/src/apps/stylededit/FindWindow.h +++ b/src/apps/stylededit/FindWindow.h @@ -26,6 +26,7 @@ class FindWindow : public BWindow { virtual void MessageReceived(BMessage* message); virtual void DispatchMessage(BMessage* message, BHandler* handler); + virtual void Show(); private: void _SendMessage(); diff --git a/src/apps/stylededit/ReplaceWindow.cpp b/src/apps/stylededit/ReplaceWindow.cpp index 40af5ec..6ab50bc 100644 --- a/src/apps/stylededit/ReplaceWindow.cpp +++ b/src/apps/stylededit/ReplaceWindow.cpp @@ -32,8 +32,8 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler, BString* searchString, BString* replaceString, bool caseState, bool wrapState, bool backState) : BWindow(frame, B_TRANSLATE("Replace"), B_FLOATING_WINDOW, - B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS, - B_CURRENT_WORKSPACE) + B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS + | B_AUTO_UPDATE_SIZE_LIMITS, B_CURRENT_WORKSPACE) { AddShortcut('W', B_COMMAND_KEY, new BMessage(MSG_HIDE_WINDOW)); @@ -158,6 +158,14 @@ ReplaceWindow::DispatchMessage(BMessage* message, BHandler* handler) void +ReplaceWindow::Show() +{ + fSearchString->TextView()->SelectAll(); + BWindow::Show(); +} + + +void ReplaceWindow::_SendMessage(uint32 what) { BMessage message(what); diff --git a/src/apps/stylededit/ReplaceWindow.h b/src/apps/stylededit/ReplaceWindow.h index 64f0034..f4b44cd 100644 --- a/src/apps/stylededit/ReplaceWindow.h +++ b/src/apps/stylededit/ReplaceWindow.h @@ -29,6 +29,7 @@ class ReplaceWindow : public BWindow { virtual void MessageReceived(BMessage* message); virtual void DispatchMessage(BMessage* message, BHandler* handler); + virtual void Show(); private: void _SendMessage(uint32 what);