Ticket #2043: network.diff

src/preferences/network/EthernetSettingsView.cpp

@@ -153 +153 @@
 {
     float inset = ceilf(be_plain_font->Size() * 0.8);
     frame.OffsetTo(inset, inset);
-    frame.right = StringWidth("IP Address XXX.XXX.XXX.XXX") + 50;
     frame.bottom = frame.top + 15; // just a starting point
     BPoint spacing(0, inset);
     
@@ -180 +179 @@
     
     fDeviceMenuField = new BMenuField(frame, "networkcards", "Adapter:", devmenu);
     AddChild(fDeviceMenuField);
-    fDeviceMenuField->ResizeToPreferred();
-    
+        
     fTypeMenuField = new BMenuField(frame, "type", "Mode:", modemenu);
     fTypeMenuField->MoveTo(fDeviceMenuField->Frame().LeftBottom() + spacing);
     AddChild(fTypeMenuField);
@@ -239 +237 @@
         + BPoint(-fApplyButton->Frame().Width(), 0));
     AddChild(fApplyButton);
 
-    ResizeTo(frame.Width() + 2 * inset, fApplyButton->Frame().bottom + inset);
-
     // take care of label alignment
-    float maxLabelWidth
+    float maxLabelWidth 
         = fDeviceMenuField->StringWidth(fDeviceMenuField->Label());
     maxLabelWidth = max_c(maxLabelWidth,
         fTypeMenuField->StringWidth(fTypeMenuField->Label()));
@@ -258 +254 @@
         fSecondaryDNSTextControl->StringWidth(
             fSecondaryDNSTextControl->Label()));
 
+    float maxWidth = fDeviceMenuField->Bounds().Width() + 10;
+    // TODO: find why the bound is smaller than the displayed widgets..
+
     fDeviceMenuField->SetDivider(maxLabelWidth + 8);
     fTypeMenuField->SetDivider(maxLabelWidth + 8);
 
@@ -266 +265 @@
     fGatewayTextControl->SetDivider(maxLabelWidth + 8);
     fPrimaryDNSTextControl->SetDivider(maxLabelWidth + 8);
     fSecondaryDNSTextControl->SetDivider(maxLabelWidth + 8);
+
+    // resize the window to make sure everything is fully shown...
+    maxWidth = max_c(maxWidth, fTypeMenuField->Bounds().Width() + 10);
+    maxWidth = max_c(maxWidth, fIPTextControl->Bounds().Width());
+    maxWidth = max_c(maxWidth, fNetMaskTextControl->Bounds().Width());
+    maxWidth = max_c(maxWidth, fGatewayTextControl->Bounds().Width());
+    maxWidth = max_c(maxWidth, fPrimaryDNSTextControl->Bounds().Width());
+    maxWidth = max_c(maxWidth, fSecondaryDNSTextControl->Bounds().Width());
+
+    ResizeTo(maxWidth + 2 * inset, fApplyButton->Frame().bottom + inset);
 }
 
 EthernetSettingsView::~EthernetSettingsView()