summaryrefslogtreecommitdiffstats
path: root/src/frontend/mame/ui/inputdevices.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2022-06-16 12:37:26 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2022-06-16 12:37:26 +1000
commit731a6bbe8ac51a5ff006a0bca574a96f8f498051 (patch)
tree546c8b0812269188490334548bdf159d2843bfa7 /src/frontend/mame/ui/inputdevices.cpp
parent4e2121d8aa3a982288849c08500712f0cb2d96bc (diff)
parente7fe75fd5c901a2b62456dcfa2fbd6144bebf233 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/frontend/mame/ui/inputdevices.cpp')
-rw-r--r--src/frontend/mame/ui/inputdevices.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontend/mame/ui/inputdevices.cpp b/src/frontend/mame/ui/inputdevices.cpp
index e1e39f0467f..6dba1d49f92 100644
--- a/src/frontend/mame/ui/inputdevices.cpp
+++ b/src/frontend/mame/ui/inputdevices.cpp
@@ -58,12 +58,12 @@ protected:
s32 const value = (input.itemclass() == ITEM_CLASS_ABSOLUTE) ? input.read_as_absolute(ITEM_MODIFIER_NONE) : input.read_as_relative(ITEM_MODIFIER_NONE);
if (0 < value)
{
- float const fillright = indcentre + (float(value) / float(INPUT_ABSOLUTE_MAX) * (indright - indcentre));
+ float const fillright = indcentre + (float(value) / float(osd::INPUT_ABSOLUTE_MAX) * (indright - indcentre));
container().add_rect(indcentre, indtop, (std::min)(fillright, indright), indbottom, fgcolor, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
}
else if (0 > value)
{
- float const fillleft = indcentre - (float(value) / float(INPUT_ABSOLUTE_MIN) * (indcentre - indleft));
+ float const fillleft = indcentre - (float(value) / float(osd::INPUT_ABSOLUTE_MIN) * (indcentre - indleft));
container().add_rect((std::max)(fillleft, indleft), indtop, indcentre, indbottom, fgcolor, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
}
container().add_line(indleft, indtop, indright, indtop, UI_LINE_WIDTH, fgcolor, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));