Ticket #5280: patch

src/apps/expander/ExpanderWindow.cpp

@@ -25 +25 @@
 #include <MenuBar.h>
 #include <MenuItem.h>
 #include <Path.h>
+#include <Screen.h>
 #include <ScrollView.h>
 #include <StringView.h>
 #include <TextView.h>
@@ -76 +77 @@
     fListingText->SetText("");
     fListingText->MakeEditable(false);
     fListingText->SetStylable(false);
+    fListingText->SetWordWrap(false);
     BFont font = be_fixed_font;
     fListingText->SetFontAndColor(&font);
     BScrollView* scrollView = new BScrollView("", fListingText,
-        B_INVALIDATE_AFTER_LAYOUT, false, true);
+        B_INVALIDATE_AFTER_LAYOUT, true, true);
 
     BView* topView = layout->View();
     const float spacing = be_control_look->DefaultItemSpacing();
@@ -158 +160 @@
 
 
 void
-ExpanderWindow::FrameResized(float width, float height)
-{
-    if (fListingText->DoesWordWrap()) {
-        BRect textRect;
-        textRect = fListingText->Bounds();
-        textRect.OffsetTo(B_ORIGIN);
-        textRect.InsetBy(1, 1);
-        fListingText->SetTextRect(textRect);
-    }
-}
-
-
-void
 ExpanderWindow::MessageReceived(BMessage* msg)
 {
     switch (msg->what) {
@@ -318 +307 @@
                 BString string;
                 int32 i = 0;
                 while (msg->FindString("output", i++, &string) == B_OK) {
-                    // expand the window if we need...
-                    float delta = fListingText->StringWidth(string.String())
-                        - fListingText->Frame().Width();
-                    if (delta > fLargestDelta) {
-                        fLargestDelta = delta;
-                    }
+                    float lineLength = fListingText->StringWidth(string.String());
+
+                    if (lineLength > fLongestLine)
+                        fLongestLine = lineLength;
+
                     fListingText->Insert(string.String());
                 }
                 fListingText->ScrollToSelection();
@@ -338 +326 @@
                 StopExpanding();
                 OpenDestFolder();
                 CloseWindowOrKeepOpen();
-            } else if (fListingStarted){
+            } else if (fListingStarted) {
                 fSourceChanged = false;
                 StopListing();
-                if (fLargestDelta > 0.0f)
-                    ResizeBy(fLargestDelta, 0.0f);
-                fLargestDelta = 0.0f;
+
+                _ExpandListingText();
             } else
                 fStatusView->SetText("");
             break;
@@ -563 +550 @@
 
 
 void
+ExpanderWindow::_ExpandListingText()
+{
+    if (fLongestLine > fListingText->Frame().Width()) {
+        BScreen screen;
+        BRect screenFrame = screen.Frame();
+        float delta = fLongestLine - fListingText->Frame().Width();
+                    
+        if (Frame().right + delta > screenFrame.right)
+            delta = screenFrame.right - Frame().right - 4.0f;
+    
+        ResizeBy(delta, 0.0f);
+    }
+}
+
+
+void
 ExpanderWindow::_UpdateWindowSize(bool showContents)
 {
     float minWidth, maxWidth, minHeight, maxHeight;
@@ -571 +574 @@
     float bottom = fSizeLimit;
 
     if (showContents) {
+        BFont font;
         font_height fontHeight;
-        be_plain_font->GetHeight(&fontHeight);
+        fListingText->GetFont(&font);       
+        font.GetHeight(&fontHeight);
         float lineHeight = ceilf(fontHeight.ascent + fontHeight.descent
             + fontHeight.leading);
 
@@ -594 +599 @@
 {
     _UpdateWindowSize(true);
 
-    fLargestDelta = 0.0f;
-
-    if (!fSourceChanged)
+    if (!fSourceChanged) {
+        _ExpandListingText();
         return;
+    }
 
+    fLongestLine = 0.0f;
+
     ExpanderRule* rule = fRules.MatchingRule(&fSourceRef);
     if (!rule)
         return;

src/apps/expander/ExpanderWindow.h

@@ -34 +34 @@
                                     const entry_ref* ref, BMessage* settings);
     virtual                     ~ExpanderWindow();
 
-    virtual void                FrameResized(float width, float height);
     virtual void                MessageReceived(BMessage* msg);
     virtual bool                QuitRequested();
 
@@ -52 +51 @@
             void                StartExpanding();
             void                StopExpanding();
             void                _UpdateWindowSize(bool showContents);
+            void                _ExpandListingText();
             void                StartListing();
             void                StopListing();
             bool                ValidateDest();
@@ -90 +90 @@
             ExpanderPreferences*    fPreferences;
             ExpanderRules       fRules;
 
-            float               fLargestDelta;
+            float               fLongestLine;
             float               fSizeLimit;
 };