Volume control slide: audio,midi,click

golden notes in editor with effect
resize screen modification
change in UMenuSelectSlide arrow click space

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2400 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 13 insertions, 2 deletions

diff --git a/us_maker_edition/src/base/UDraw.pas b/us_maker_edition/src/base/UDraw.pas
index 308526b8..bb9f28ca 100644
--- a/us_maker_edition/src/base/UDraw.pas
+++ b/us_maker_edition/src/base/UDraw.pas
@@ -1044,6 +1044,7 @@ var
   Rec:   TRecR;
   Count: integer;
   TempR: real;
+  GoldenStarPos: real;
 begin
   glColor3f(1, 1, 1);
   glEnable(GL_TEXTURE_2D);
@@ -1076,7 +1077,7 @@ begin
           glTexCoord2f(1, 1); glVertex2f(Rec.Right, Rec.Bottom);
           glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
         glEnd;
-
+        GoldenStarPos := Rec.Left;
         // middle part
         Rec.Left  := Rec.Right;
         Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
@@ -1100,6 +1101,10 @@ begin
           glTexCoord2f(1, 1); glVertex2f(Rec.Right, Rec.Bottom);
           glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
         glEnd;
+        if (NoteType = ntGolden) and (Ini.EffectSing=1) then
+        begin
+          GoldenRec.SaveGoldenStarsRec(GoldenStarPos, Rec.Top, Rec.Right, Rec.Bottom);
+        end;
 
       end; // with
     end; // for
diff --git a/us_maker_edition/src/base/UThemes.pas b/us_maker_edition/src/base/UThemes.pas
index 1f18dcc5..af901b03 100644
--- a/us_maker_edition/src/base/UThemes.pas
+++ b/us_maker_edition/src/base/UThemes.pas
@@ -517,7 +517,10 @@ type
       SlideStart:          TThemeSelectSlide;
       SlideDuration:       TThemeSelectSlide;
       SlideTone:           TThemeSelectSlide;
-      SlideLyric:          TThemeSelectSlide;                  
+      SlideLyric:          TThemeSelectSlide;
+      SelectVolAudio:      TThemeSelectSlide;
+      SelectVolMidi:       TThemeSelectSlide;
+      SelectVolClick:      TThemeSelectSlide;
   end;
 
   //Error- and Check-Popup
@@ -1412,6 +1415,9 @@ begin
       ThemeLoadSelectSlide(EditSub.SlideDuration, 'EditSubDuration');
       ThemeLoadSelectSlide(EditSub.SlideTone, 'EditSubTone');
       ThemeLoadSelectSlide(EditSub.SlideLyric, 'EditSubLyric');
+      ThemeLoadSelectSlide(EditSub.SelectVolAudio, 'EditSubSelectVolAudio');
+      ThemeLoadSelectSlide(EditSub.SelectVolMidi, 'EditSubSelectVolMidi');
+      ThemeLoadSelectSlide(EditSub.SelectVolClick, 'EditSubSelectVolClick');
 
       //error and check popup
       ThemeLoadBasic (ErrorPopup, 'ErrorPopup');