From 840264a413d8457cba4a71d8df155d76086e2c3d Mon Sep 17 00:00:00 2001 From: Quote <94698137+ChronoQuote@users.noreply.github.com> Date: Fri, 2 Sep 2022 21:46:07 -0700 Subject: [PATCH] Improve sliders -SlideBar sliders now use the ID system that Slider3/Slider4/etc. sliders use, which allows the game to remember which slider is being used so that the player may move their cursor outside the slider when using it, improving QoL -Add an OnSliderID=0 check to each MouseDown1 check so that hovering over a slider while using a different slider doesn't switch which slider is being used -Add missing OnSliderID checks to various MouseOn checks to ensure that when using a slider, only that slider's tooltip is shown --- Main.bb | 48 ++++++++++++++++++++--------------------- Menu.bb | 66 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/Main.bb b/Main.bb index a5012f2f2..997b22b74 100644 --- a/Main.bb +++ b/Main.bb @@ -7298,10 +7298,10 @@ Function DrawMenu() y=y+30*MenuScale - ScreenGamma = (SlideBar(x + 270*MenuScale, y+6*MenuScale, 100*MenuScale, ScreenGamma*50.0)/50.0) + ScreenGamma = (SlideBar(x + 270*MenuScale, y+6*MenuScale, 100*MenuScale, ScreenGamma*50.0, 1)/50.0) Color 255,255,255 AAText(x, y, "Screen gamma") - If MouseOn(x+270*MenuScale,y+6*MenuScale,100*MenuScale+14,20) And OnSliderID=0 + If (MouseOn(x+270*MenuScale,y+6*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"gamma",ScreenGamma) EndIf @@ -7352,20 +7352,20 @@ Function DrawMenu() ;[Block] y = y + 50*MenuScale - MusicVolume = (SlideBar(x + 250*MenuScale, y-4*MenuScale, 100*MenuScale, MusicVolume*100.0)/100.0) + MusicVolume = (SlideBar(x + 250*MenuScale, y-4*MenuScale, 100*MenuScale, MusicVolume*100.0, 1)/100.0) Color 255,255,255 AAText(x, y, "Music volume:") - If MouseOn(x+250*MenuScale,y-4*MenuScale,100*MenuScale+14,20) + If (MouseOn(x+250*MenuScale,y-4*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"musicvol",MusicVolume) EndIf y = y + 30*MenuScale - PrevSFXVolume = (SlideBar(x + 250*MenuScale, y-4*MenuScale, 100*MenuScale, SFXVolume*100.0)/100.0) + PrevSFXVolume = (SlideBar(x + 250*MenuScale, y-4*MenuScale, 100*MenuScale, SFXVolume*100.0, 2)/100.0) If (Not DeafPlayer) Then SFXVolume# = PrevSFXVolume# Color 255,255,255 AAText(x, y, "Sound volume:") - If MouseOn(x+250*MenuScale,y-4*MenuScale,100*MenuScale+14,20) + If (MouseOn(x+250*MenuScale,y-4*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=2 DrawOptionsTooltip(tx,ty,tw,th,"soundvol",PrevSFXVolume) EndIf @@ -7374,7 +7374,7 @@ Function DrawMenu() Color 100,100,100 AAText x, y, "Sound auto-release:" EnableSFXRelease = DrawTick(x + 270 * MenuScale, y + MenuScale, EnableSFXRelease,True) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th+220*MenuScale,"sfxautorelease") EndIf @@ -7383,7 +7383,7 @@ Function DrawMenu() Color 100,100,100 AAText x, y, "Enable user tracks:" EnableUserTracks = DrawTick(x + 270 * MenuScale, y + MenuScale, EnableUserTracks,True) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"usertrack") EndIf @@ -7397,7 +7397,7 @@ Function DrawMenu() Else AAText x, y + 20 * MenuScale, "Random" EndIf - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"usertrackmode") EndIf ;DrawButton(x, y + 30 * MenuScale, 190 * MenuScale, 25 * MenuScale, "Scan for User Tracks",False) @@ -7411,10 +7411,10 @@ Function DrawMenu() ;[Block] y = y + 50*MenuScale - MouseSens = (SlideBar(x + 270*MenuScale, y-4*MenuScale, 100*MenuScale, (MouseSens+0.5)*100.0)/100.0)-0.5 + MouseSens = (SlideBar(x + 270*MenuScale, y-4*MenuScale, 100*MenuScale, (MouseSens+0.5)*100.0, 1)/100.0)-0.5 Color(255, 255, 255) AAText(x, y, "Mouse sensitivity:") - If MouseOn(x+270*MenuScale,y-4*MenuScale,100*MenuScale+14,20) + If (MouseOn(x+270*MenuScale,y-4*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"mousesensitivity",MouseSens) EndIf @@ -7423,16 +7423,16 @@ Function DrawMenu() Color(255, 255, 255) AAText(x, y, "Invert mouse Y-axis:") InvertMouse = DrawTick(x + 270 * MenuScale, y + MenuScale, InvertMouse) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"mouseinvert") EndIf y = y + 40*MenuScale - MouseSmooth = (SlideBar(x + 270*MenuScale, y-4*MenuScale, 100*MenuScale, (MouseSmooth)*50.0)/50.0) + MouseSmooth = (SlideBar(x + 270*MenuScale, y-4*MenuScale, 100*MenuScale, (MouseSmooth)*50.0, 2)/50.0) Color(255, 255, 255) AAText(x, y, "Mouse smoothing:") - If MouseOn(x+270*MenuScale,y-4*MenuScale,100*MenuScale+14,20) + If (MouseOn(x+270*MenuScale,y-4*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=2 DrawOptionsTooltip(tx,ty,tw,th,"mousesmoothing",MouseSmooth) EndIf @@ -7464,7 +7464,7 @@ Function DrawMenu() AAText(x, y + 200 * MenuScale, "Open/Close Console") InputBox(x + 200 * MenuScale, y + 200 * MenuScale,100*MenuScale,20*MenuScale,KeyName(Min(KEY_CONSOLE,210)),12) - If MouseOn(x,y,300*MenuScale,220*MenuScale) + If MouseOn(x,y,300*MenuScale,220*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"controls") EndIf @@ -7505,7 +7505,7 @@ Function DrawMenu() Color 255,255,255 AAText(x, y, "Show HUD:") HUDenabled = DrawTick(x + 270 * MenuScale, y + MenuScale, HUDenabled) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"hud") EndIf @@ -7514,7 +7514,7 @@ Function DrawMenu() Color 255,255,255 AAText(x, y, "Enable console:") CanOpenConsole = DrawTick(x +270 * MenuScale, y + MenuScale, CanOpenConsole) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"consoleenable") EndIf @@ -7523,7 +7523,7 @@ Function DrawMenu() Color 255,255,255 AAText(x, y, "Open console on error:") ConsoleOpening = DrawTick(x + 270 * MenuScale, y + MenuScale, ConsoleOpening) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"consoleerror") EndIf @@ -7532,7 +7532,7 @@ Function DrawMenu() Color 255,255,255 AAText(x, y, "Achievement popups:") AchvMSGenabled% = DrawTick(x + 270 * MenuScale, y, AchvMSGenabled%) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"achpopup") EndIf @@ -7541,7 +7541,7 @@ Function DrawMenu() Color 255,255,255 AAText(x, y, "Show FPS:") ShowFPS% = DrawTick(x + 270 * MenuScale, y, ShowFPS%) - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"showfps") EndIf @@ -7555,19 +7555,19 @@ Function DrawMenu() ;CurrFrameLimit# = (SlideBar(x + 150*MenuScale, y+30*MenuScale, 100*MenuScale, CurrFrameLimit#*50.0)/50.0) ;CurrFrameLimit = Max(CurrFrameLimit, 0.1) ;Framelimit% = CurrFrameLimit#*100.0 - CurrFrameLimit# = (SlideBar(x + 150*MenuScale, y+30*MenuScale, 100*MenuScale, CurrFrameLimit#*99.0)/99.0) + CurrFrameLimit# = (SlideBar(x + 150*MenuScale, y+30*MenuScale, 100*MenuScale, CurrFrameLimit#*99.0, 1)/99.0) CurrFrameLimit# = Max(CurrFrameLimit, 0.01) Framelimit% = 19+(CurrFrameLimit*100.0) Color 255,255,0 AAText(x + 5 * MenuScale, y + 25 * MenuScale, Framelimit%+" FPS") - If MouseOn(x+150*MenuScale,y+30*MenuScale,100*MenuScale+14,20) + If (MouseOn(x+150*MenuScale,y+30*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"framelimit",Framelimit) EndIf Else CurrFrameLimit# = 0.0 Framelimit = 0 EndIf - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"framelimit",Framelimit) EndIf @@ -7601,7 +7601,7 @@ Function DrawMenu() ;ReloadAAFont() AATextEnable_Prev% = AATextEnable EndIf - If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+270*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"antialiastext") EndIf ;[End Block] diff --git a/Menu.bb b/Menu.bb index 24351fc65..99eb552e4 100644 --- a/Menu.bb +++ b/Menu.bb @@ -649,10 +649,10 @@ Function UpdateMainMenu() y=y+30*MenuScale ;Local prevGamma# = ScreenGamma - ScreenGamma = (SlideBar(x + 310*MenuScale, y+6*MenuScale, 150*MenuScale, ScreenGamma*50.0)/50.0) + ScreenGamma = (SlideBar(x + 310*MenuScale, y+6*MenuScale, 150*MenuScale, ScreenGamma*50.0, 1)/50.0) Color 255,255,255 AAText(x + 20 * MenuScale, y, "Screen gamma") - If MouseOn(x+310*MenuScale,y+6*MenuScale,150*MenuScale+14,20) And OnSliderID=0 + If (MouseOn(x+310*MenuScale,y+6*MenuScale,150*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"gamma",ScreenGamma) EndIf @@ -704,21 +704,21 @@ Function UpdateMainMenu() y = y + 20*MenuScale - MusicVolume = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, MusicVolume*100.0)/100.0) + MusicVolume = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, MusicVolume*100.0, 1)/100.0) Color 255,255,255 AAText(x + 20 * MenuScale, y, "Music volume:") - If MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) + If (MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"musicvol",MusicVolume) EndIf y = y + 40*MenuScale ;SFXVolume = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, SFXVolume*100.0)/100.0) - PrevSFXVolume = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, SFXVolume*100.0)/100.0) + PrevSFXVolume = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, SFXVolume*100.0, 2)/100.0) SFXVolume = PrevSFXVolume Color 255,255,255 AAText(x + 20 * MenuScale, y, "Sound volume:") - If MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) + If (MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=2 DrawOptionsTooltip(tx,ty,tw,th,"soundvol",PrevSFXVolume) EndIf ;If MouseDown1 Then @@ -759,7 +759,7 @@ Function UpdateMainMenu() EndIf EnableSFXRelease_Prev% = EnableSFXRelease EndIf - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th+220*MenuScale,"sfxautorelease") EndIf y = y + 30*MenuScale @@ -767,7 +767,7 @@ Function UpdateMainMenu() Color 255,255,255 AAText x + 20 * MenuScale, y, "Enable user tracks:" EnableUserTracks = DrawTick(x + 310 * MenuScale, y + MenuScale, EnableUserTracks) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"usertrack") EndIf @@ -781,7 +781,7 @@ Function UpdateMainMenu() Else AAText x + 350 * MenuScale, y + MenuScale, "Random" EndIf - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"usertrackmode") EndIf If DrawButton(x + 20 * MenuScale, y + 30 * MenuScale, 190 * MenuScale, 25 * MenuScale, "Scan for User Tracks",False) @@ -807,7 +807,7 @@ Function UpdateMainMenu() DebugLog "User Tracks Check Ended" EndIf - If MouseOn(x+20*MenuScale,y+30*MenuScale,190*MenuScale,25*MenuScale) + If MouseOn(x+20*MenuScale,y+30*MenuScale,190*MenuScale,25*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"usertrackscan") EndIf If UserTrackCheck%>0 @@ -824,10 +824,10 @@ Function UpdateMainMenu() y = y + 20*MenuScale - MouseSens = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, (MouseSens+0.5)*100.0)/100.0)-0.5 + MouseSens = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, (MouseSens+0.5)*100.0, 1)/100.0)-0.5 Color(255, 255, 255) AAText(x + 20 * MenuScale, y, "Mouse sensitivity:") - If MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) + If (MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"mousesensitivity",MouseSens) EndIf @@ -836,16 +836,16 @@ Function UpdateMainMenu() Color(255, 255, 255) AAText(x + 20 * MenuScale, y, "Invert mouse Y-axis:") InvertMouse = DrawTick(x + 310 * MenuScale, y + MenuScale, InvertMouse) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"mouseinvert") EndIf y = y + 40*MenuScale - MouseSmooth = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, (MouseSmooth)*50.0)/50.0) + MouseSmooth = (SlideBar(x + 310*MenuScale, y-4*MenuScale, 150*MenuScale, (MouseSmooth)*50.0, 2)/50.0) Color(255, 255, 255) AAText(x + 20 * MenuScale, y, "Mouse smoothing:") - If MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) + If (MouseOn(x+310*MenuScale,y-4*MenuScale,150*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=2 DrawOptionsTooltip(tx,ty,tw,th,"mousesmoothing",MouseSmooth) EndIf @@ -877,7 +877,7 @@ Function UpdateMainMenu() AAText(x + 280 * MenuScale, y + 100 * MenuScale, "Open/Close Console") InputBox(x + 470 * MenuScale, y + 100 * MenuScale,100*MenuScale,20*MenuScale,KeyName(Min(KEY_CONSOLE,210)),12) - If MouseOn(x+20*MenuScale,y,width-40*MenuScale,120*MenuScale) + If MouseOn(x+20*MenuScale,y,width-40*MenuScale,120*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"controls") EndIf @@ -920,7 +920,7 @@ Function UpdateMainMenu() Color 255,255,255 AAText(x + 20 * MenuScale, y, "Show HUD:") HUDenabled = DrawTick(x + 310 * MenuScale, y + MenuScale, HUDenabled) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"hud") EndIf @@ -929,7 +929,7 @@ Function UpdateMainMenu() Color 255,255,255 AAText(x + 20 * MenuScale, y, "Enable console:") CanOpenConsole = DrawTick(x + 310 * MenuScale, y + MenuScale, CanOpenConsole) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"consoleenable") EndIf @@ -938,7 +938,7 @@ Function UpdateMainMenu() Color 255,255,255 AAText(x + 20 * MenuScale, y, "Open console on error:") ConsoleOpening = DrawTick(x + 310 * MenuScale, y + MenuScale, ConsoleOpening) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"consoleerror") EndIf @@ -947,7 +947,7 @@ Function UpdateMainMenu() Color 255,255,255 AAText(x + 20 * MenuScale, y, "Achievement popups:") AchvMSGenabled% = DrawTick(x + 310 * MenuScale, y + MenuScale, AchvMSGenabled%) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"achpopup") EndIf @@ -956,7 +956,7 @@ Function UpdateMainMenu() Color 255,255,255 AAText(x + 20 * MenuScale, y, "Show FPS:") ShowFPS% = DrawTick(x + 310 * MenuScale, y + MenuScale, ShowFPS%) - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"showfps") EndIf @@ -969,19 +969,19 @@ Function UpdateMainMenu() ;CurrFrameLimit# = (SlideBar(x + 150*MenuScale, y+30*MenuScale, 100*MenuScale, CurrFrameLimit#*50.0)/50.0) ;CurrFrameLimit = Max(CurrFrameLimit, 0.1) ;Framelimit% = CurrFrameLimit#*100.0 - CurrFrameLimit# = (SlideBar(x + 150*MenuScale, y+30*MenuScale, 100*MenuScale, CurrFrameLimit#*99.0)/99.0) + CurrFrameLimit# = (SlideBar(x + 150*MenuScale, y+30*MenuScale, 100*MenuScale, CurrFrameLimit#*99.0, 1)/99.0) CurrFrameLimit# = Max(CurrFrameLimit, 0.01) Framelimit% = 19+(CurrFrameLimit*100.0) Color 255,255,0 AAText(x + 25 * MenuScale, y + 25 * MenuScale, Framelimit%+" FPS") - If MouseOn(x+150*MenuScale,y+30*MenuScale,100*MenuScale+14,20) + If (MouseOn(x+150*MenuScale,y+30*MenuScale,100*MenuScale+14,20) And OnSliderID=0) Or OnSliderID=1 DrawOptionsTooltip(tx,ty,tw,th,"framelimit",Framelimit) EndIf Else CurrFrameLimit# = 0.0 Framelimit = 0 EndIf - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"framelimit",Framelimit) EndIf @@ -1015,7 +1015,7 @@ Function UpdateMainMenu() ;ReloadAAFont() AATextEnable_Prev% = AATextEnable EndIf - If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) + If MouseOn(x+310*MenuScale,y+MenuScale,20*MenuScale,20*MenuScale) And OnSliderID=0 DrawOptionsTooltip(tx,ty,tw,th,"antialiastext") EndIf ;[End Block] @@ -1750,17 +1750,21 @@ Function DrawTick%(x%, y%, selected%, locked% = False) Return selected End Function -Function SlideBar#(x%, y%, width%, value#) +Function SlideBar#(x%, y%, width%, value#, ID%) If MouseDown1 And OnSliderID=0 Then If ScaledMouseX() >= x And ScaledMouseX() <= x + width + 14 And ScaledMouseY() >= y And ScaledMouseY() <= y + 20 Then - value = Min(Max((ScaledMouseX() - x) * 100 / width, 0), 100) + OnSliderID = ID EndIf EndIf Color 255,255,255 Rect(x, y, width + 14, 20,False) + If ID = OnSliderID + value = Min(Max((ScaledMouseX() - x) * 100 / width, 0), 100) + EndIf + DrawImage(BlinkMeterIMG, x + width * value / 100.0 +3, y+3) Color 170,170,170 @@ -2268,7 +2272,7 @@ Global OnSliderID% = 0 Function Slider3(x%,y%,width%,value%,ID%,val1$,val2$,val3$) - If MouseDown1 Then + If MouseDown1 And OnSliderID = 0 Then If (ScaledMouseX() >= x) And (ScaledMouseX() <= x+width+14) And (ScaledMouseY() >= y-8) And (ScaledMouseY() <= y+10) OnSliderID = ID EndIf @@ -2320,7 +2324,7 @@ End Function Function Slider4(x%,y%,width%,value%,ID%,val1$,val2$,val3$,val4$) - If MouseDown1 Then + If MouseDown1 And OnSliderID = 0 Then If (ScaledMouseX() >= x) And (ScaledMouseX() <= x+width+14) And (ScaledMouseY() >= y-8) And (ScaledMouseY() <= y+10) OnSliderID = ID EndIf @@ -2379,7 +2383,7 @@ End Function Function Slider5(x%,y%,width%,value%,ID%,val1$,val2$,val3$,val4$,val5$) - If MouseDown1 Then + If MouseDown1 And OnSliderID = 0 Then If (ScaledMouseX() >= x) And (ScaledMouseX() <= x+width+14) And (ScaledMouseY() >= y-8) And (ScaledMouseY() <= y+10) OnSliderID = ID EndIf @@ -2445,7 +2449,7 @@ End Function Function Slider7(x%,y%,width%,value%,ID%,val1$,val2$,val3$,val4$,val5$,val6$,val7$) - If MouseDown1 Then + If MouseDown1 And OnSliderID = 0 Then If (ScaledMouseX() >= x) And (ScaledMouseX() <= x+width+14) And (ScaledMouseY() >= y-8) And (ScaledMouseY() <= y+10) OnSliderID = ID EndIf