From 859340a5659d190342144218c9dc7aa5313a7ece Mon Sep 17 00:00:00 2001 From: danomatika Date: Mon, 21 Aug 2017 22:30:19 +0200 Subject: [PATCH] resize dialog_startup based on widget sizing, should fix incorrect size on Linux; dialog_path shoud require scrollbox --- tcl/dialog_path.tcl | 4 +++- tcl/dialog_startup.tcl | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tcl/dialog_path.tcl b/tcl/dialog_path.tcl index fec0461f38..f63b636881 100644 --- a/tcl/dialog_path.tcl +++ b/tcl/dialog_path.tcl @@ -1,6 +1,8 @@ package provide dialog_path 0.1 +package require scrollboxwindow + namespace eval ::dialog_path:: { variable use_standard_paths_button 1 variable verbose_button 0 @@ -42,7 +44,7 @@ proc ::dialog_path::pdtk_path_dialog {mytoplevel extrapath verbose} { proc ::dialog_path::create_dialog {mytoplevel} { global docspath global installpath - scrollboxwindow::make $mytoplevel $::sys_searchpath \ + ::scrollboxwindow::make $mytoplevel $::sys_searchpath \ dialog_path::add dialog_path::edit dialog_path::commit \ [_ "Pd search path for objects, help, fonts, and other files"] \ 450 300 1 diff --git a/tcl/dialog_startup.tcl b/tcl/dialog_startup.tcl index 3132d264d0..7219c7854e 100644 --- a/tcl/dialog_startup.tcl +++ b/tcl/dialog_startup.tcl @@ -84,7 +84,8 @@ proc ::dialog_startup::create_dialog {mytoplevel} { ::scrollboxwindow::make $mytoplevel $::startup_libraries \ dialog_startup::add dialog_startup::edit dialog_startup::commit \ [_ "Pd libraries to load on startup"] \ - 450 320 0 + 450 300 0 + wm geometry $mytoplevel "" ::pd_bindings::dialog_bindings $mytoplevel "startup" frame $mytoplevel.flags @@ -94,9 +95,9 @@ proc ::dialog_startup::create_dialog {mytoplevel} { pack $mytoplevel.flags.entry -side right -expand 1 -fill x pack $mytoplevel.flags.entryname -side right - frame $mytoplevel.defeatrtframe - pack $mytoplevel.defeatrtframe -side top -anchor s -fill x -padx 2m -pady 5 if {$::windowingsystem ne "win32"} { + frame $mytoplevel.defeatrtframe + pack $mytoplevel.defeatrtframe -side top -anchor s -fill x -padx 2m -pady 5 checkbutton $mytoplevel.defeatrtframe.defeatrt -anchor w \ -text [_ "Defeat real-time scheduling"] \ -variable ::dialog_startup::defeatrt_button @@ -128,6 +129,10 @@ proc ::dialog_startup::create_dialog {mytoplevel} { $mytoplevel.nb.buttonframe.ok config -highlightthickness 0 $mytoplevel.nb.buttonframe.cancel config -highlightthickness 0 } + + # set min size based on widget sizing + update + wm minsize $mytoplevel [winfo width $mytoplevel] [winfo height $mytoplevel] } # for focus handling on OSX