From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 28 May 2020 17:22:21 +0000 (-0600)
Subject: patchgui track height tumber fix
X-Git-Tag: 2020-05~3
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=f46839d462b640dd0542b2d87c7ab03e72a72613;p=goodguy%2Fcinelerra.git
patchgui track height tumber fix
---
diff --git a/cinelerra-5.1/cinelerra/patchgui.C b/cinelerra-5.1/cinelerra/patchgui.C
index cb2c2403..e69b707a 100644
--- a/cinelerra-5.1/cinelerra/patchgui.C
+++ b/cinelerra-5.1/cinelerra/patchgui.C
@@ -580,7 +580,7 @@ int MutePatch::button_release_event()
ZoomPatch::ZoomPatch(MWindow *mwindow, PatchGUI *patch, int x, int y)
- : BC_Tumbler(x, y)
+ : BC_Tumbler(x, y, mwindow->theme->get_image_set("tumblepatch_data"))
{
this->mwindow = mwindow;
this->patch = patch;
diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
index cd6cede9..7a54ee9b 100644
--- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C
@@ -446,7 +446,7 @@ void BlondTheme::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_bottom.png
index 3d79ddf0..a3ede9d7 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_hi.png
index fbb6de48..7d5b2f82 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_top.png
index b1378d7a..d386668b 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_up.png
index b4412e22..1cc13fa4 100644
Binary files a/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_blond/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
index 38276f90..258b9e5b 100644
--- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
+++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C
@@ -120,7 +120,7 @@ void BlondCVTheme::initialize()
"tumble_hi.png",
"tumble_botdn.png",
"tumble_topdn.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_bottom.png
index 3d79ddf0..0f6b79b3 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_hi.png
index fbb6de48..688e8f68 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_top.png
index b1378d7a..9ea58bec 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_up.png
index b4412e22..a9a99f16 100644
Binary files a/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_blond_cv/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
index f77b50f0..7b47576b 100644
--- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C
+++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C
@@ -445,7 +445,7 @@ void BlueDotTheme::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_bottom.png
index 3d79ddf0..ed8edfbc 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_hi.png
index fbb6de48..00804463 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_top.png
index b1378d7a..f93fa1a3 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_up.png
index b4412e22..1364c061 100644
Binary files a/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_blue/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index fe5559dd..8255adc0 100644
--- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@ -439,7 +439,7 @@ void BlueDotTheme::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_bottom.png
index 3d79ddf0..9e56c44e 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_hi.png
index fbb6de48..02d8af95 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_top.png
index b1378d7a..665cd615 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_up.png
index b4412e22..47e96c4a 100644
Binary files a/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_blue_dot/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
index 82737f90..fdce3ce0 100644
--- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C
+++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C
@@ -448,7 +448,7 @@ void BrightTheme::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_bottom.png
index 3d79ddf0..5c90748d 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_hi.png
index fbb6de48..b1de55dd 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_top.png
index b1378d7a..6d821062 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_up.png
index b4412e22..02a2490d 100644
Binary files a/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_bright/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
index 947569ff..c44ef502 100644
--- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
+++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C
@@ -439,7 +439,7 @@ void CAKEWALKTHEME::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_bottom.png
index 3d79ddf0..feeefb12 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_hi.png
index fbb6de48..4fa1d681 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_top.png
index b1378d7a..a3192560 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_up.png
index b4412e22..00a68a9a 100644
Binary files a/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_hulk/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
index e5d1dd3d..3a9971f6 100644
--- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
+++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C
@@ -445,7 +445,7 @@ void HULKTHEME::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_bottom.png
index 3d79ddf0..c14ea51f 100644
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_hi.png
index fbb6de48..98579d29 100644
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_top.png
index b1378d7a..8ca5d1fa 100644
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_up.png
index b4412e22..1a50b631 100644
Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
index 2a0d2f03..450adef7 100644
--- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
+++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C
@@ -549,7 +549,7 @@ void NEOPHYTETHEME::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_bottom.png
index 3d79ddf0..49c79e3c 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_hi.png
index fbb6de48..fd65e7bd 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_top.png
index b1378d7a..f2d942d7 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_up.png
index b4412e22..bf532629 100644
Binary files a/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_pinklady/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
index 191187f0..e07369fd 100644
--- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
+++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C
@@ -445,7 +445,7 @@ void PINKLADY::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C
index 751e4855..2b3700b8 100644
--- a/cinelerra-5.1/plugins/theme_suv/suv.C
+++ b/cinelerra-5.1/plugins/theme_suv/suv.C
@@ -441,7 +441,7 @@ void SUV::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_bottom.png b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_bottom.png
index 3d79ddf0..8cc63bfd 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_bottom.png and b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_bottom.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_hi.png
index fbb6de48..dd434b5c 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_hi.png and b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_hi.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_top.png b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_top.png
index b1378d7a..dbabd14c 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_top.png and b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_top.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_up.png b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_up.png
index b4412e22..c0ae5333 100644
Binary files a/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_up.png and b/cinelerra-5.1/plugins/theme_unflat/data/tumblepatch_up.png differ
diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 16508edf..82a8e815 100644
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -446,7 +446,7 @@ void UNFLATTHEME::initialize()
"tumble_hi.png",
"tumble_bottom.png",
"tumble_top.png");
- resources->tumblepatch_data = new_image_set(4,
+ new_image_set("tumblepatch_data", 4,
"tumblepatch_up.png",
"tumblepatch_hi.png",
"tumblepatch_bottom.png",