dylan/cs2-demo-mapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PATCH bounding issue with slider

Browse Source
This commit is contained in:
Dylan De Faoite
2025-04-22 18:08:32 +02:00
parent 028bc36b4f
commit f107cd207b
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
states/start_menu.py
View File

@@ -103,7 +103,7 @@ class StartMenu(GameState):
self.demo_file = None self.demo_file = None
def update(self): def update(self):
self.manager.update(0.1) self.manager.update(0.01)
def draw(self): def draw(self):
"""Draws everything on screen.""" """Draws everything on screen."""

31
widgets/slider.py
View File

@@ -16,24 +16,43 @@ class HorizontalSlider:
self.rect_radius = 5 self.rect_radius = 5
self.knob_radius = 10 self.knob_radius = 10
self.knob_x = self.x self.knob_x = self.x + self.knob_radius
self.dragging = False self.dragging = False
self.fill = False self.fill = False
self.fill_colour = (128, 128, 0) self.fill_colour = (128, 128, 0)
def _knob_to_value(self, knob_x):
return self.min_value + ((self.max_value - self.min_value) * ((knob_x - (self.x + self.knob_radius)) / (self.width-self.knob_radius)))
def _value_to_knob(self, value):
return self.x + ((self.width-self.knob_radius) * ((value - self.min_value) / (self.max_value - self.min_value))) + self.knob_radius
def handle_event(self, event): def handle_event(self, event):
"""Handle mouse events for dragging""" """Handle mouse events for dragging"""
if event.type == pygame.MOUSEBUTTONDOWN: if event.type == pygame.MOUSEBUTTONDOWN:
if event.pos[0] >= self.x and event.pos[0] <= self.x + self.width and event.pos[1] >= self.y and event.pos[1] <= self.y + self.height: if (
self.knob_x = event.pos[0] event.pos[0] >= self.x
and event.pos[0] <= self.x + self.width
and event.pos[1] >= self.y
and event.pos[1] <= self.y + self.height
):
if event.pos[0] < self.x + self.knob_radius:
self.knob_x = self.x + self.knob_radius
elif event.pos[0] > self.x + self.width - self.knob_radius:
self.knob_x = self.x + self.width - self.knob_radius
else:
self.knob_x = event.pos[0]
self.dragging = True self.dragging = True
elif event.type == pygame.MOUSEBUTTONUP: elif event.type == pygame.MOUSEBUTTONUP:
self.dragging = False self.dragging = False
elif event.type == pygame.MOUSEMOTION and self.dragging: elif event.type == pygame.MOUSEMOTION and self.dragging:
if event.pos[0] >= self.x and event.pos[0] <= self.x + self.width: if (
event.pos[0] >= self.x + self.knob_radius
and event.pos[0] <= self.x + self.width - self.knob_radius
):
self.knob_x = event.pos[0] self.knob_x = event.pos[0]
self.value = self.min_value + ((self.max_value - self.min_value) * ((self.knob_x - self.x) / self.width)) self.value = self._knob_to_value(self.knob_x)
def draw(self): def draw(self):
""" """
@@ -59,7 +78,7 @@ class HorizontalSlider:
else: else:
self.value = value self.value = value
self.knob_x = self.x + (self.width * ((self.value - self.min_value) / (self.max_value - self.min_value))) self.knob_x = self._value_to_knob(value)
def set_radius(self, radius): def set_radius(self, radius):
self.knob_radius = radius self.knob_radius = radius