refactor: unify dpi scaling rules and error handling

Author: mashu3

tests/test_dpi.py

@@ -706,6 +706,7 @@ def update_dpi_scaling(self):
                 return
 
             width, height, x, y = map(int, match.groups())
+            # Use unified scaling rule: DPI_scaling only
             scaled_width = int(width * self.dpi_scaling_factor)
             scaled_height = int(height * self.dpi_scaling_factor)
             # Don't scale position coordinates (x, y) - keep them as is

tkface/dialog/datepicker.py

@@ -48,14 +48,6 @@ def _create_dialog_window(parent: Optional[tk.Tk]) -> tk.Toplevel:
     return dialog
 
 
-def _setup_dialog_properties(dialog: tk.Toplevel, title: str, scaled_sizes: dict):
-    """Setup dialog window properties."""
-    dialog.title(title)
-    dialog.resizable(True, True)
-    dialog.minsize(scaled_sizes["min_width"], scaled_sizes["min_height"])
-    dialog.geometry(f"{scaled_sizes['default_width']}x{scaled_sizes['default_height']}")
-
-
 def _position_dialog(
     dialog: tk.Toplevel,
     parent: Optional[tk.Tk],
@@ -138,19 +130,6 @@ def askpath(
     # Create dialog window
     dialog = _create_dialog_window(parent)
 
-    # Cache DPI scaling calculations for performance (similar to messagebox.py)
-    scaled_sizes = win.calculate_dpi_sizes(
-        {
-            "min_width": 900,
-            "min_height": 450,
-            "default_width": 1000,
-            "default_height": 450,
-            "padding": 10,
-        },
-        dialog,
-        max_scale=1.5,
-    )
-
     # Set dialog properties
     if title is None:
         if select == "file":
@@ -162,7 +141,26 @@ def askpath(
         if multiple:
             title += "s"
 
-    _setup_dialog_properties(dialog, title, scaled_sizes)
+    # Set basic dialog properties
+    dialog.title(title)
+    dialog.resizable(True, True)
+    
+    # Get DPI scaling factor and apply it manually to avoid double-scaling
+    try:
+        scaling_factor = win.get_scaling_factor(dialog)
+    except Exception as e:
+        scaling_factor = 1.0
+    
+    # Calculate scaled sizes
+    scaled_width = int(700 * scaling_factor)
+    scaled_height = int(500 * scaling_factor)
+    
+    # Apply manual scaling to avoid double-scaling issues
+    dialog.minsize(scaled_width, int(scaled_height * 0.5))
+    dialog.geometry(f"{scaled_width}x{scaled_height}")
+    
+    # Force update to ensure geometry is applied
+    dialog.update_idletasks()
 
     # Make dialog modal
     if parent:
@@ -185,12 +183,16 @@ def askpath(
     browser.pack(
         fill=tk.BOTH,
         expand=True,
-        padx=scaled_sizes["padding"],
-        pady=scaled_sizes["padding"],
+        padx=10,
+        pady=10,
     )
 
     # Position the dialog (after content is created)
+    # Note: _position_dialog may override our geometry, so we'll set it again after positioning
     _position_dialog(dialog, parent, x, y, x_offset, y_offset)
+    
+    # Re-apply our desired size after positioning (in case _position_dialog overrode it)
+    dialog.geometry(f"{scaled_width}x{scaled_height}")
 
     # Result storage
     result = []

tkface/dialog/pathchooser.py

@@ -273,6 +273,7 @@ def _get_scaled_font(self, base_font):
         try:
             if isinstance(base_font, tuple):
                 family, size, *style = base_font
+                # Use scale_font_size which now handles positive sizes correctly
                 scaled_size = scale_font_size(size, self, self.dpi_scaling_factor)
                 return (family, scaled_size, *style)
             return base_font

tkface/widget/calendar/core.py

@@ -451,6 +451,7 @@ def _create_calendar_grid(calendar_instance, month_frame, month_index):
             bd=0,
             bg=calendar_instance.theme_colors["day_header_bg"],
             fg=calendar_instance.theme_colors["day_header_fg"],
+            width=3,  # Fixed width for consistent column sizing
         )
         empty_header.grid(row=0, column=0, sticky="nsew", padx=1, pady=1)
     for day, day_name in enumerate(day_names):
@@ -464,6 +465,7 @@ def _create_calendar_grid(calendar_instance, month_frame, month_index):
             bd=0,
             bg=calendar_instance.theme_colors["day_header_bg"],
             fg=calendar_instance.theme_colors["day_header_fg"],
+            width=3,  # Fixed width for consistent column sizing
         )
         col = day + 1 if calendar_instance.show_week_numbers else day
         day_header.grid(row=0, column=col, sticky="nsew", padx=1, pady=1)
@@ -480,6 +482,7 @@ def _create_calendar_grid(calendar_instance, month_frame, month_index):
                 bd=0,
                 bg=calendar_instance.theme_colors["week_number_bg"],
                 fg=calendar_instance.theme_colors["week_number_fg"],
+                width=3,  # Fixed width for consistent column sizing
             )
             week_label.grid(row=week + 1, column=0, sticky="nsew", padx=1, pady=1)
             calendar_instance.week_labels.append(week_label)
@@ -496,6 +499,7 @@ def _create_calendar_grid(calendar_instance, month_frame, month_index):
                 bg=calendar_instance.theme_colors["day_bg"],
                 fg=calendar_instance.theme_colors["day_fg"],
                 cursor="hand2",
+                width=3,  # Fixed width for consistent column sizing
             )
             col = day + 1 if calendar_instance.show_week_numbers else day
             day_label.grid(row=week + 1, column=col, sticky="nsew", padx=1, pady=1)

tkface/widget/calendar/view.py

@@ -84,11 +84,11 @@ def _create_main_paned_window(pathbrowser_instance):
     pathbrowser_instance.paned = ttk.PanedWindow(
         pathbrowser_instance, orient=tk.HORIZONTAL
     )
-    pathbrowser_instance.paned.pack(fill=tk.BOTH, expand=True, padx=5, pady=5)
+    pathbrowser_instance.paned.pack(fill=tk.BOTH, expand=True, padx=2, pady=2)
 
     # Left pane - Directory tree
     pathbrowser_instance.tree_frame = ttk.Frame(pathbrowser_instance.paned)
-    pathbrowser_instance.paned.add(pathbrowser_instance.tree_frame, weight=1)
+    pathbrowser_instance.paned.add(pathbrowser_instance.tree_frame, weight=2)
 
     # Directory tree with icons and better styling
     pathbrowser_instance.tree = ttk.Treeview(
@@ -97,13 +97,55 @@ def _create_main_paned_window(pathbrowser_instance):
         selectmode="browse",
         height=10,  # Reduced height for smaller dialog
     )
-    pathbrowser_instance.tree.pack(fill=tk.BOTH, expand=True, padx=5, pady=5)
+    pathbrowser_instance.tree.pack(fill=tk.BOTH, expand=True, padx=2, pady=2)
+    
+    # Set initial sash position to give 200px to the tree view (DPI-scaled)
+    # This will be applied after the paned window is fully created
+    def set_dpi_scaled_sash():
+        try:
+            # Get DPI scaling factor
+            from tkface.win.dpi import get_scaling_factor
+            scaling_factor = get_scaling_factor(pathbrowser_instance)
+            dpi_scaled_width = int(200 * scaling_factor)
+            pathbrowser_instance.paned.sashpos(0, dpi_scaled_width)
+        except Exception:
+            # Fallback to unscaled 200px if DPI detection fails
+            pathbrowser_instance.paned.sashpos(0, 200)
+    
+    pathbrowser_instance.after(100, set_dpi_scaled_sash)
 
     # Configure tree style for better appearance
     style = ttk.Style()
     # Set row height based on OS - Windows uses original spacing, others use compact
     row_height = 25 if utils.IS_WINDOWS else 20
     style.configure("Treeview", rowheight=row_height)
+    
+    # Bind to tree selection to adjust indent based on current level
+    def adjust_tree_indent(event=None):
+        """Adjust tree indent based on current directory level."""
+        try:
+            current_dir = pathbrowser_instance.state.current_dir
+            # Count directory depth from root
+            path_parts = Path(current_dir).parts
+            depth = len(path_parts) - 1  # Subtract 1 for root
+            
+            # Calculate indent: base indent minus depth-based offset
+            # This reduces left padding for deeper directories
+            base_indent = 20
+            depth_offset = min(depth * 2, 15)  # Max 15px reduction
+            adjusted_indent = max(base_indent - depth_offset, 5)  # Min 5px
+            
+            # Apply the adjusted indent
+            style.configure("Treeview", indent=adjusted_indent)
+            
+        except Exception as e:
+            logger.debug("Failed to adjust tree indent: %s", e)
+    
+    # Bind to directory changes to adjust indent
+    pathbrowser_instance.tree.bind("<<TreeviewSelect>>", adjust_tree_indent)
+    
+    # Initial adjustment
+    pathbrowser_instance.after(100, adjust_tree_indent)
 
 
 def _create_file_list(pathbrowser_instance):
@@ -149,23 +191,23 @@ def _create_file_list(pathbrowser_instance):
     )
 
     pathbrowser_instance.file_tree.column("#0", width=200, minwidth=150)
-    pathbrowser_instance.file_tree.column("size", width=80, minwidth=60)
+    pathbrowser_instance.file_tree.column("size", width=70, minwidth=50)
     pathbrowser_instance.file_tree.column("modified", width=120, minwidth=100)
-    pathbrowser_instance.file_tree.column("type", width=100, minwidth=80)
+    pathbrowser_instance.file_tree.column("type", width=60, minwidth=50)
 
     # Apply OS-specific row height to file tree as well
     style = ttk.Style()
-    row_height = 25 if utils.IS_WINDOWS else 20
+    row_height = 20
     style.configure("Treeview", rowheight=row_height)
 
-    pathbrowser_instance.file_tree.pack(fill=tk.BOTH, expand=True, padx=5, pady=5)
+    pathbrowser_instance.file_tree.pack(fill=tk.BOTH, expand=True, padx=2, pady=2)
 
 
 def _create_status_and_buttons(pathbrowser_instance):
     """Create status bar and bottom buttons in a horizontal layout."""
     # Bottom frame containing status bar and buttons
     pathbrowser_instance.bottom_frame = ttk.Frame(pathbrowser_instance)
-    pathbrowser_instance.bottom_frame.pack(fill=tk.X, padx=5, pady=5, side=tk.BOTTOM)
+    pathbrowser_instance.bottom_frame.pack(fill=tk.X, padx=2, pady=2, side=tk.BOTTOM)
 
     # Status bar (left side)
     pathbrowser_instance.status_var = tk.StringVar()
@@ -267,11 +309,13 @@ def _create_toolbar(pathbrowser_instance):
 
 def create_pathbrowser_widgets(pathbrowser_instance):
     """Create the widget layout for PathBrowser."""
+    # Pack bottom areas first so they remain visible even when window is small
     _create_path_navigation(pathbrowser_instance)
-    _create_main_paned_window(pathbrowser_instance)
-    _create_file_list(pathbrowser_instance)
     _create_status_and_buttons(pathbrowser_instance)
     _create_toolbar(pathbrowser_instance)
+    # Main content takes the remaining space
+    _create_main_paned_window(pathbrowser_instance)
+    _create_file_list(pathbrowser_instance)
 
     # Initialize view mode
     pathbrowser_instance.view_mode = "details"
@@ -397,25 +441,48 @@ def setup_pathbrowser_bindings(pathbrowser_instance):
 def load_directory_tree(pathbrowser_instance):
     """Load the directory tree."""
     pathbrowser_instance.tree.delete(*pathbrowser_instance.tree.get_children())
+    # Flatten view to start at the current directory level to avoid left-side slack
+    try:
+        base_path = Path(pathbrowser_instance.state.current_dir)
+
+        # List only immediate subdirectories of the current directory as top-level
+        dirs = []
+        for item in base_path.iterdir():
+            if item.is_dir():
+                dirs.append((item.name, str(item)))
 
-    # Add root directories with better icons and labels
-    if utils.IS_WINDOWS:  # Windows
-        for drive in string.ascii_uppercase:
-            drive_path = f"{drive}:\\"
-            if Path(drive_path).exists():
-                # Get drive label if possible
+        # Sort and add directories
+        dirs.sort(key=lambda x: x[0].lower())
+
+        for child_name, child_path in dirs:
+            if not pathbrowser_instance.tree.exists(child_path):
+                # Insert as top-level item (no ancestors, no extra left indent)
                 pathbrowser_instance.tree.insert(
-                    "", "end", drive_path, text=drive_path, open=False
+                    "", "end", child_path, text=child_name, open=False
                 )
-                # Pre-populate root level directories for better UX
-                populate_tree_node(pathbrowser_instance, drive_path)
-    else:  # Unix-like
-        pathbrowser_instance.tree.insert("", "end", "/", text="/", open=False)
-        # Pre-populate root level directories for better UX
-        populate_tree_node(pathbrowser_instance, "/")
-
-    # Expand current directory path
-    expand_path(pathbrowser_instance, pathbrowser_instance.state.current_dir)
+
+                # Add placeholder if the directory has subdirectories (for lazy loading)
+                with suppress(OSError, PermissionError):
+                    has_subdirs = False
+                    for subitem in base_path.joinpath(child_name).iterdir():
+                        if subitem.is_dir():
+                            has_subdirs = True
+                            break
+                    if has_subdirs:
+                        placeholder_id = f"{child_path}_placeholder"
+                        if not pathbrowser_instance.tree.exists(placeholder_id):
+                            pathbrowser_instance.tree.insert(
+                                child_path,
+                                "end",
+                                placeholder_id,
+                                text=lang.get("Loading...", pathbrowser_instance),
+                                open=False,
+                            )
+    except (OSError, PermissionError) as e:
+        logger.warning("Failed to load directory tree for %s: %s", base_path, e)
+        pathbrowser_instance.status_var.set(
+            f"{lang.get('Cannot access:', pathbrowser_instance)} {base_path.name}"
+        )
 
 
 def populate_tree_node(pathbrowser_instance, parent):

tkface/widget/pathbrowser/view.py

@@ -18,27 +18,18 @@
     get_button_label_with_shortcut,
 )
 from .dpi import (
-    add_scalable_property,
     calculate_dpi_sizes,
     configure_ttk_widgets_for_dpi,
-    disable_auto_dpi_scaling,
     dpi,
-    enable_auto_dpi_scaling,
     enable_dpi_awareness,
     enable_dpi_geometry,
     get_actual_window_size,
     get_effective_dpi,
-    get_scalable_properties,
     get_scaling_factor,
-    is_auto_dpi_scaling_enabled,
     logical_to_physical,
-    patch_tk_widgets_to_ttk,
     physical_to_logical,
-    remove_scalable_property,
     scale_font_size,
     scale_icon,
-    scale_widget_dimensions,
-    scale_widget_tree,
 )
 from .unround import (
     disable_auto_unround,
@@ -60,15 +51,6 @@
     "get_effective_dpi",
     "logical_to_physical",
     "physical_to_logical",
-    "enable_auto_dpi_scaling",
-    "disable_auto_dpi_scaling",
-    "is_auto_dpi_scaling_enabled",
-    "scale_widget_dimensions",
-    "scale_widget_tree",
-    "get_scalable_properties",
-    "add_scalable_property",
-    "remove_scalable_property",
-    "patch_tk_widgets_to_ttk",
     "configure_button_for_windows",
     "get_button_label_with_shortcut",
     "FlatButton",