Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

[CSlider] On click move the slider-button to the mouse position

Browse Source 
Reviewed By: vladislavbelov
Refs: #2593
Differential Revision: https://code.wildfiregames.com/D1622
This was SVN commit r22164.
This commit is contained in:
Imarok 2019-04-06 18:47:22 +00:00
parent 99e03b9311
commit 359df88f1a
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/gui/CSlider.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -44,6 +44,17 @@ CSlider::~CSlider()
{
}
float CSlider::GetSliderRatio() const
{
return (m_MaxValue - m_MinValue) / (m_CachedActualSize.GetWidth() - m_ButtonSide);
}
void CSlider::IncrementallyChangeValue(const float difference)
{
m_Value = Clamp(m_Value + difference, m_MinValue, m_MaxValue);
UpdateValue();
}
void CSlider::HandleMessage(SGUIMessage& Message)
{
switch (Message.type)
@ -61,25 +72,22 @@ void CSlider::HandleMessage(SGUIMessage& Message)
{
if (m_IsPressed)
break;
m_Value = std::max(m_Value - 0.01f, m_MinValue);
UpdateValue();
IncrementallyChangeValue(-0.01f);
break;
}
case GUIM_MOUSE_WHEEL_UP:
{
if (m_IsPressed)
break;
m_Value = std::min(m_Value + 0.01f, m_MaxValue);
UpdateValue();
IncrementallyChangeValue(0.01f);
break;
}
case GUIM_MOUSE_PRESS_LEFT:
{
if (GetButtonRect().PointInside(GetMousePos()))
{
m_Mouse = GetMousePos();
m_IsPressed = true;
}
m_Mouse = GetMousePos();
m_IsPressed = true;
IncrementallyChangeValue((m_Mouse.x - GetButtonRect().CenterPoint().x) * GetSliderRatio());
break;
}
case GUIM_MOUSE_RELEASE_LEFT:
@ -93,11 +101,9 @@ void CSlider::HandleMessage(SGUIMessage& Message)
m_IsPressed = false;
if (m_IsPressed)
{
float ratio = (m_MaxValue - m_MinValue) / (m_CachedActualSize.GetWidth() - m_ButtonSide);
float difference = float(GetMousePos().x - m_Mouse.x) * ratio;
float difference = float(GetMousePos().x - m_Mouse.x) * GetSliderRatio();
m_Mouse = GetMousePos();
m_Value = Clamp(m_Value + difference, m_MinValue, m_MaxValue);
UpdateValue();
IncrementallyChangeValue(difference);
}
break;
}
@ -127,7 +133,7 @@ void CSlider::Draw()
}
void CSlider::UpdateValue()
{
{
GUI<float>::SetSetting(this, "value", m_Value);
ScriptEvent("valuechange");
}

9
source/gui/CSlider.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -45,6 +45,13 @@ protected:
CRect GetButtonRect();
/**
* @return ratio between the value of the slider and its actual size in the GUI
*/
float GetSliderRatio() const;
void IncrementallyChangeValue(const float value);
float m_MinValue, m_MaxValue, m_Value;
private: