From e36fa2d4bdf95e0ad9c06828145c79611bd2770d Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Tue, 31 Jul 2012 14:02:34 -0400
Subject: [PATCH] fixed remaining bugs with asynchronous nature of various ways
to enable edit mode/cord inspector/tooltips in K12 mode
---
src/g_editor.c | 3 ++-
src/pd.tk | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/g_editor.c b/src/g_editor.c
index 33813fe79..7cb797269 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -4890,11 +4890,12 @@ void canvas_magicglass(t_canvas *x, t_floatarg fyesplease)
void canvas_tooltips(t_canvas *x, t_floatarg fyesplease)
{
+ //fprintf(stderr,"canvas_tooltips %f\n", fyesplease);
int yesplease = fyesplease;
if (yesplease && tooltips)
return;
if (!tooltips) {
- canvas_editmode(x, 1.);
+ if (!sys_k12_mode) canvas_editmode(x, 1.);
tooltips = 1;
}
else {
diff --git a/src/pd.tk b/src/pd.tk
index f1bf2023e..521993ddb 100644
--- a/src/pd.tk
+++ b/src/pd.tk
@@ -1800,7 +1800,7 @@ proc menu_magicglass {name} {
proc menu_editmode {name} {
global k12_mode
pd [concat $name editmode 0 \;]
- if { $k12_mode == 1 } { menu_tooltips $name }
+ #if { $k12_mode == 1 } { menu_tooltips $name }
}
proc menu_tooltips {name} {
@@ -2970,7 +2970,7 @@ proc pdtk_canvas_new {name width height geometry editable} {
bind $name <FocusIn> "menu_fixeditmenu $name"
# bind $name <FocusOut> { pdtk_noselect %W }
- if { $k12_mode == 1 && $editable } { menu_tooltips $name }
+ if { $k12_mode == 1 } { menu_tooltips $name }
focus $name.c
if { $k12_mode == 1 && $k12_saveas_on_new == 1 } {
--
GitLab