Skip to content

connected_tab: fix State/Device column autosizing #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
+19 −12
Merged

connected_tab: fix State/Device column autosizing #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions src/gui/connected_tab/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use nwg::stretch::{
geometry::{Rect, Size},
style::{Dimension as D, FlexDirection},
};
use windows_sys::Win32::UI::Controls::LVSCW_AUTOSIZE;
use windows_sys::Win32::UI::Controls::LVSCW_AUTOSIZE_USEHEADER;
use windows_sys::Win32::UI::Shell::SIID_SHIELD;

Expand All @@ -20,7 +21,7 @@ use crate::gui::{
nwg_ext::{BitmapEx, MenuItemEx},
usbipd_gui::GuiTab,
};
use crate::usbipd::{self, UsbDevice};
use crate::usbipd::{self, UsbDevice, UsbipState};

const PADDING_LEFT: Rect<D> = Rect {
start: D::Points(8.0),
Expand Down Expand Up @@ -137,16 +138,22 @@ impl ConnectedTab {
}

fn init_list(&self) {
let dv = &self.list_view;
dv.clear();
dv.insert_column("Bus ID");
dv.insert_column("Device");
dv.insert_column("State");
dv.set_headers_enabled(true);

dv.set_column_width(0, LVSCW_AUTOSIZE_USEHEADER as isize);
dv.set_column_width(1, 415);
dv.set_column_width(2, LVSCW_AUTOSIZE_USEHEADER as isize);
let list = &self.list_view;
list.clear();
list.insert_column("Bus ID");
list.insert_column("State");
list.insert_column("Device");
list.set_headers_enabled(true);

// Insert a dummy row, with max-width content in columns where AUTOSIZE is used
list.insert_items_row(None, &["-", &format!("{} ", UsbipState::None), "Device"]);

list.set_column_width(0, LVSCW_AUTOSIZE_USEHEADER as isize);
list.set_column_width(1, LVSCW_AUTOSIZE as isize);
list.set_column_width(2, LVSCW_AUTOSIZE_USEHEADER as isize);

// Clear the dummy row
list.clear();
}

/// Clears the device list and reloads it with the currently connected devices.
Expand All @@ -159,8 +166,8 @@ impl ConnectedTab {
None,
&[
device.bus_id.as_deref().unwrap_or("-"),
device.description.as_deref().unwrap_or("Unknown device"),
&device.state().to_string(),
device.description.as_deref().unwrap_or("Unknown device"),
],
);
}
Expand Down