From ba0dc79b793a391ce37a1125fa2bb0de0d02b5f8 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Tue, 6 Dec 2011 19:51:12 -0500
Subject: [PATCH] Improved drawing logic for the console window (pd.tk) plus a
version bump for m_pd.h
---
src/m_pd.h | 2 +-
src/pd.tk | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/m_pd.h b/src/m_pd.h
index 13a928b7e..610d44f89 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 5
-#define PD_TEST_VERSION "extended-l2ork-20111130"
+#define PD_TEST_VERSION "extended-l2ork-20111203"
/* old name for "MSW" flag -- we have to take it for the sake of many old
"nmakefiles" for externs, which will define NT and not MSW */
diff --git a/src/pd.tk b/src/pd.tk
index 8912f147d..2be7b968f 100644
--- a/src/pd.tk
+++ b/src/pd.tk
@@ -655,10 +655,11 @@ toplevel .printout
wm title .printout "Console"
# initial location of the console window (+x+y)
wm geometry .printout +10+170
+# wm minsize .printout 460 194
wm protocol .printout WM_DELETE_WINDOW { .controls.switches.console invoke }
match_linux_wm [list frame .printout.frame]
text .printout.frame.text -relief sunken -bd 1 -font console_font \
- -yscrollcommand ".printout.frame.scroll set" -width 70 -height 24 \
+ -yscrollcommand ".printout.frame.scroll set" -width 70 -height 24 \
-highlightthickness 0 -takefocus 0 -fg gray20 -state disabled
#.printout.frame.text tag configure sel -background $linux_wm_hlcolor
@@ -679,11 +680,11 @@ match_linux_wm [list label .printout.bar.label -text "Send Message to Pd:"]
pack .printout.frame.scroll -side right -fill y
pack .printout.frame.text -side left -fill both -expand 1
+pack .printout.bar -side bottom -fill x -expand 1
pack .printout.frame -fill both -expand 1
-pack .printout.bar -side left -fill x -expand 1
pack .printout.bar.clear -side left -padx 3 -pady 3
#pack .printout.bar.x -side right -padx 3 -pady 3
-pack .printout.bar.entry -side right -fill x -expand 1 -padx 5 -pady 3
+pack .printout.bar.entry -side right -fill both -expand 1 -padx 5 -pady 3
pack .printout.bar.label -side right -padx 3 -pady 3
# the console is open by default
@@ -696,7 +697,7 @@ wm withdraw .printout
bind .printout.frame.text <Button> {pdtk_update_root_edit_menu 0}
bind .printout.frame.text <<Selection>> {pdtk_update_root_edit_menu 1}
-bind .printout <Control-Next> {menu_raisenextwindow}
+bind .printout <Control-Next> {menu_raisenextwindow}
bind .printout <Control-w> { .controls.switches.console invoke }
proc pdtk_update_root_edit_menu {value} {
--
GitLab