i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preflet/network: Fix window dynamics, scale right pane only

Browse Source 
* Left list now static in width
* Right dynamic
* Fix dynamic nature of right networkinterface info pane

Change-Id: I678a3355c95ed5c4c759b5b1e3715e5e170979fd
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4962
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2022-12-23 16:54:27 +00:00
committed by waddlesplash
parent d6c326d699
commit 61f5f30ce3
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/network/InterfaceView.cpp
+2 -11
View File
@@ -50,35 +50,27 @@ InterfaceView::InterfaceView()
// TODO: Small graph of throughput?
float minimumWidth = be_control_look->DefaultItemSpacing() * 16;
BStringView* statusLabel = new BStringView("status label",
B_TRANSLATE("Status:"));
BStringView* statusLabel = new BStringView("status label", B_TRANSLATE("Status:"));
statusLabel->SetAlignment(B_ALIGN_RIGHT);
fStatusField = new BStringView("status field", "");
fStatusField->SetExplicitMinSize(BSize(minimumWidth, B_SIZE_UNSET));
BStringView* macAddressLabel = new BStringView("mac address label",
B_TRANSLATE("MAC address:"));
macAddressLabel->SetAlignment(B_ALIGN_RIGHT);
fMacAddressField = new BStringView("mac address field", "");
fMacAddressField->SetExplicitMinSize(BSize(minimumWidth, B_SIZE_UNSET));
BStringView* linkSpeedLabel = new BStringView("link speed label",
B_TRANSLATE("Link speed:"));
linkSpeedLabel->SetAlignment(B_ALIGN_RIGHT);
fLinkSpeedField = new BStringView("link speed field", "");
fLinkSpeedField->SetExplicitMinSize(BSize(minimumWidth, B_SIZE_UNSET));
// TODO: These metrics may be better in a BScrollView?
BStringView* linkTxLabel = new BStringView("tx label",
B_TRANSLATE("Sent:"));
linkTxLabel->SetAlignment(B_ALIGN_RIGHT);
fLinkTxField = new BStringView("tx field", "");
fLinkTxField ->SetExplicitMinSize(BSize(minimumWidth, B_SIZE_UNSET));
BStringView* linkRxLabel = new BStringView("rx label",
B_TRANSLATE("Received:"));
linkRxLabel->SetAlignment(B_ALIGN_RIGHT);
fLinkRxField = new BStringView("rx field", "");
fLinkRxField ->SetExplicitMinSize(BSize(minimumWidth, B_SIZE_UNSET));
fNetworkMenuField = new BMenuField(B_TRANSLATE("Network:"), new BMenu(
B_TRANSLATE("Choose automatically")));
@@ -97,8 +89,7 @@ InterfaceView::InterfaceView()
.AddGrid()
.Add(statusLabel, 0, 0)
.Add(fStatusField, 1, 0)
.Add(fNetworkMenuField->CreateLabelLayoutItem(), 0, 1)
.Add(fNetworkMenuField->CreateMenuBarLayoutItem(), 1, 1)
.AddMenuField(fNetworkMenuField, 0, 1, B_ALIGN_RIGHT, 1, 2)
.Add(macAddressLabel, 0, 2)
.Add(fMacAddressField, 1, 2)
.Add(linkSpeedLabel, 0, 3)
src/preferences/network/NetworkWindow.cpp
+5 -3
View File
@@ -91,7 +91,7 @@ public:
NetworkWindow::NetworkWindow()
:
BWindow(BRect(100, 100, 400, 400), B_TRANSLATE_SYSTEM_NAME("Network"),
BWindow(BRect(100, 100, 750, 400), B_TRANSLATE_SYSTEM_NAME("Network"),
B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS),
fServicesItem(NULL),
@@ -129,11 +129,12 @@ NetworkWindow::NetworkWindow()
BScrollView* scrollView = new BScrollView("ScrollView", fListView,
0, false, true);
scrollView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
scrollView->SetExplicitMaxSize(BSize(B_SIZE_UNSET, B_SIZE_UNLIMITED));
fAddOnShellView = new BView("add-on shell", 0,
new BGroupLayout(B_VERTICAL));
fAddOnShellView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
fAddOnShellView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
fInterfaceView = new InterfaceView();
@@ -150,7 +151,8 @@ NetworkWindow::NetworkWindow()
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
.Add(scrollView)
.Add(fAddOnShellView)
.End()
.End()
.Add(showReplicantCheckBox)
.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
.Add(fRevertButton)