immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mouse wheel fixes

dev-ui
Piotr Dziwinski 2012-09-19 21:45:41 +02:00
parent 10c9d92cd2
commit 1a79137e90
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/edit.cpp
View File

@ -238,16 +238,16 @@ bool CEdit::EventProcess(const Event &event)
if ( (m_state & STATE_VISIBLE) == 0 ) return true;
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 5 &&
if (event.type == EVENT_MOUSE_WHEEL &&
event.mouseWheel.dir == WHEEL_UP &&
Detect(event.pos) )
{
Scroll(m_lineFirst-3, true);
return true;
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 4 && // TODO
Detect(event.pos) )
if (event.type == EVENT_KEY_DOWN &&
event.mouseWheel.dir == WHEEL_DOWN &&
Detect(event.mouseWheel.pos) )
{
Scroll(m_lineFirst+3, true);
return true;

10
src/ui/editvalue.cpp
View File

@ -189,9 +189,9 @@ bool CEditValue::EventProcess(const Event &event)
if ( !m_buttonDown->EventProcess(event) ) return false;
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 4 &&
Detect(event.pos) )
if (event.type == EVENT_MOUSE_WHEEL &&
event.mouseWheel.dir == WHEEL_UP &&
Detect(event.mouseWheel.pos))
{
value = GetValue()+m_stepValue;
if ( value > m_maxValue ) value = m_maxValue;
@ -199,8 +199,8 @@ bool CEditValue::EventProcess(const Event &event)
HiliteValue(event);
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 5 &&
Detect(event.pos) )
event.mouseWheel.dir == WHEEL_DOWN &&
Detect(event.mouseWheel.pos))
{
value = GetValue()-m_stepValue;
if ( value < m_minValue ) value = m_minValue;

4
src/ui/list.cpp
View File

@ -257,7 +257,7 @@ bool CList::EventProcess(const Event &event)
if ((m_state & STATE_ENABLE) == 0)
return true;
if (event.type == EVENT_KEY_DOWN && event.mouseButton.button == 5 && Detect(event.pos)) {
if (event.type == EVENT_MOUSE_WHEEL && event.mouseWheel.dir == WHEEL_UP && Detect(event.mouseWheel.pos)) {
if (m_firstLine > 0)
m_firstLine--;
UpdateScroll();
@ -265,7 +265,7 @@ bool CList::EventProcess(const Event &event)
return true;
}
if (event.type == EVENT_KEY_DOWN && event.mouseButton.button == 4 && Detect(event.pos)) {
if (event.type == EVENT_MOUSE_WHEEL && event.mouseWheel.dir == WHEEL_DOWN && Detect(event.mouseWheel.pos)) {
if (m_firstLine < m_totalLine - m_displayLine)
m_firstLine++;
UpdateScroll();

16
src/ui/scroll.cpp
View File

@ -292,19 +292,19 @@ bool CScroll::EventProcess(const Event &event)
m_bCapture = false;
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 4 &&
Detect(event.pos) &&
m_buttonUp != 0 )
if (event.type == EVENT_MOUSE_WHEEL &&
event.mouseWheel.dir == WHEEL_UP &&
Detect(event.mouseWheel.pos) &&
m_buttonUp != 0)
{
Event newEvent = event;
newEvent.type = m_buttonUp->GetEventType();
m_event->AddEvent(newEvent);
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 5 &&
Detect(event.pos) &&
m_buttonDown != 0 )
if (event.type == EVENT_MOUSE_WHEEL &&
event.mouseWheel.dir == WHEEL_DOWN &&
Detect(event.mouseWheel.pos) &&
m_buttonDown != 0)
{
Event newEvent = event;
newEvent.type = m_buttonDown->GetEventType();

16
src/ui/slider.cpp
View File

@ -356,20 +356,20 @@ bool CSlider::EventProcess(const Event &event)
m_bCapture = false;
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 4 &&
Detect(event.pos) &&
m_buttonLeft != 0 )
if (event.type == EVENT_MOUSE_WHEEL &&
event.mouseWheel.dir == WHEEL_UP &&
Detect(event.mouseWheel.pos) &&
m_buttonLeft != 0)
{
Event newEvent = event;
newEvent.type = m_buttonLeft->GetEventType();
m_event->AddEvent(newEvent);
}
if ( event.type == EVENT_KEY_DOWN &&
event.mouseButton.button == 5 &&
Detect(event.pos) &&
m_buttonRight != 0 )
if (event.type == EVENT_MOUSE_WHEEL &&
event.mouseButton.button == WHEEL_DOWN &&
Detect(event.mouseWheel.pos) &&
m_buttonRight != 0)
{
Event newEvent = event;
newEvent.type = m_buttonRight->GetEventType();