Ticket #4146: magnify.diff

src/apps/magnify/Magnify.h

@@ -169 +169 @@
         void            AddMenu();
         void            SetMagView(TMagnify* magView);
 
+        char            fInfoStr[64];
+        char            fRGBStr[64];
+        char            fCH1Str[64];
+        char            fCH2Str[64];
+
     private:
         float           fFontHeight;
         TMagnify*       fMagView;
@@ -183 +188 @@
 
         BPoint          fCH1Loc;
         BPoint          fCH2Loc;
-
-        char            fInfoStr[64];
-        char            fRGBStr[64];
-        char            fCH1Str[64];
-        char            fCH2Str[64];
 };
 
 class TWindow : public BWindow {
@@ -219 +219 @@
         void            ShowInfo(bool);
         bool            InfoIsShowing();
         void            UpdateInfo();
+        void            UpdateInfoBarOnResize();
 
         void            AddCrossHair();
         void            RemoveCrossHair();
@@ -240 +241 @@
         float           fFontHeight;
 
         bool            fShowGrid;
+        bool            fInfoBarState;
 
         int32           fHPixelCount;
         int32           fVPixelCount;

src/apps/magnify/Magnify.cpp

@@ -277 +277 @@
             break;
 
         case msg_show_info:
-            if (active)
+            if (active) {
+                fInfoBarState = !fInfoBarState;
                 ShowInfo(!fShowInfo);
+            }
             break;
 
         case msg_toggle_grid:
@@ -466 +468 @@
 DONE:
     fShowGrid = showGrid;
     fShowInfo = showInfo;
+    fInfoBarState = showInfo;
     fHPixelCount = (overridePixelCount == -1) ? hPixelCount : overridePixelCount;
     fVPixelCount = (overridePixelCount == -1) ? vPixelCount : overridePixelCount;
     fPixelSize = pixelSize;
@@ -513 +516 @@
 {
     CalcViewablePixels();
     fFatBits->InitBuffers(fHPixelCount, fVPixelCount, fPixelSize, ShowGrid());
+    UpdateInfoBarOnResize();
 }
 
 
@@ -677 +681 @@
 
 
 void
+TWindow::UpdateInfoBarOnResize()
+{
+    float width, height;
+    GetPreferredSize(&width, &height);
+
+    if (fInfo->StringWidth(fInfo->fInfoStr) + 30 > width
+        ||  fInfo->StringWidth(fInfo->fCH1Str) +
+            fInfo->StringWidth(fInfo->fCH2Str) +
+            fInfo->StringWidth(fInfo->fRGBStr) + 30 > width) {
+        ShowInfo(false);
+    } else if (fInfoBarState) {
+        ShowInfo(true);
+    }
+}
+
+
+void
 TWindow::AddCrossHair()
 {
     fFatBits->AddCrossHair();