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

Changes in Ui, solves part of #47

dev-ui
Michał Konopacki 2012-09-19 22:17:28 +02:00
parent 1a79137e90
commit 57d33d79ea
17 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/button.cpp
View File

@ -105,7 +105,7 @@ bool CButton::EventProcess(const Event &event)
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
m_bCapture = true;
m_repeat = DELAY1;
@ -128,7 +128,7 @@ bool CButton::EventProcess(const Event &event)
event.mouseButton.button == 1 &&
m_bCapture )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
if ( !m_bImmediat && !m_bRepeat )
{

2
src/ui/check.cpp
View File

@ -77,7 +77,7 @@ bool CCheck::EventProcess(const Event &event)
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
Event newEvent = event;
newEvent.type = m_eventType;

2
src/ui/color.cpp
View File

@ -109,7 +109,7 @@ bool CColor::EventProcess(const Event &event)
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
m_repeat = DELAY1;

2
src/ui/compass.cpp
View File

@ -62,7 +62,7 @@ bool CCompass::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_BUTTON_DOWN &&
event.mouseButton.button == 1)
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
Event newEvent = event;
newEvent.type = m_eventType;

4
src/ui/control.cpp
View File

@ -323,7 +323,7 @@ bool CControl::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_BUTTON_DOWN && event.mouseButton.button == 1)
{
if ( Detect(event.pos) )
if ( Detect(event.mouseButton.pos) )
{
m_bCapture = true;
SetState(STATE_PRESS);
@ -332,7 +332,7 @@ bool CControl::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_MOVE && m_bCapture )
{
if ( Detect(event.pos) )
if ( Detect(event.mouseMove.pos) )
{
SetState(STATE_PRESS);
}

2
src/ui/displayinfo.cpp
View File

@ -103,7 +103,7 @@ bool CDisplayInfo::EventProcess(const Event &event)
toto = static_cast<CMotionToto*>(m_toto->GetMotion());
if ( toto != 0 )
{
toto->SetMousePos(event.pos);
toto->SetMousePos(event.mouseMove.pos);
}
}
}

78
src/ui/edit.cpp
View File

@ -17,7 +17,7 @@
// edit.cpp
#include "app/app.h"
#include "ui/edit.h"
#include <string.h>
@ -263,8 +263,8 @@ bool CEdit::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_MOVE )
{
if ( Detect(event.pos) &&
event.pos.x < m_pos.x+m_dim.x-(m_bMulti?MARGX+SCROLL_WIDTH:0.0f) )
if ( Detect(event.mouseMove.pos) &&
event.mouseMove.pos.x < m_pos.x+m_dim.x-(m_bMulti?MARGX+SCROLL_WIDTH:0.0f) )
{
if ( m_bEdit )
{
@ -272,7 +272,7 @@ bool CEdit::EventProcess(const Event &event)
}
else
{
if ( IsLinkPos(event.pos) )
if ( IsLinkPos(event.mouseMove.pos) )
{
m_engine->SetMouseType(Gfx::ENG_MOUSE_HAND);
}
@ -297,100 +297,100 @@ bool CEdit::EventProcess(const Event &event)
if ( event.type == EVENT_KEY_DOWN && m_bFocus )
{
bShift = (event.keyState&KS_SHIFT);
bControl = (event.keyState&KS_CONTROL);
bShift = ( (event.trackedKeys & TRKEY_SHIFT) != 0 );
bControl = ( (event.trackedKeys & TRKEY_CONTROL) != 0);
if ( (event.param == 'X' && !bShift && bControl) ||
(event.param == KEY(DELETE) && bShift && !bControl) )
if ( (event.key.unicode == 'X' && !bShift && bControl) ||
(event.key.key == KEY(DELETE) && bShift && !bControl) )
{
Cut();
return true;
}
if ( (event.param == 'C' && !bShift && bControl) ||
(event.param == KEY(INSERT) && !bShift && bControl) )
if ( (event.key.unicode == 'C' && !bShift && bControl) ||
(event.key.key == KEY(INSERT) && !bShift && bControl) )
{
Copy();
return true;
}
if ( (event.param == 'V' && !bShift && bControl) ||
if ( (event.key.unicode == 'V' && !bShift && bControl) ||
(event.param == KEY(INSERT) && bShift && !bControl) )
{
Paste();
return true;
}
if ( event.param == 'A' && !bShift && bControl )
if ( event.key.unicode == 'A' && !bShift && bControl )
{
SetCursor(999999, 0);
return true;
}
if ( event.param == 'O' && !bShift && bControl )
if ( event.key.unicode == 'O' && !bShift && bControl )
{
Event newEvent(EVENT_STUDIO_OPEN);
// m_event->NewEvent(newEvent, EVENT_STUDIO_OPEN);
m_event->AddEvent(newEvent);
}
if ( event.param == 'S' && !bShift && bControl )
if ( event.key.unicode == 'S' && !bShift && bControl )
{
Event newEvent( EVENT_STUDIO_SAVE );
// m_event->MakeEvent(newEvent, EVENT_STUDIO_SAVE);
m_event->AddEvent(newEvent);
}
if ( event.param == 'Z' && !bShift && bControl )
if ( event.key.unicode == 'Z' && !bShift && bControl )
{
Undo();
return true;
}
if ( event.param == 'U' && !bShift && bControl )
if ( event.key.unicode == 'U' && !bShift && bControl )
{
if ( MinMaj(false) ) return true;
}
if ( event.param == 'U' && bShift && bControl )
if ( event.key.unicode == 'U' && bShift && bControl )
{
if ( MinMaj(true) ) return true;
}
if ( event.param == KEY(TAB) && !bShift && !bControl && !m_bAutoIndent )
if ( event.key.key == KEY(TAB) && !bShift && !bControl && !m_bAutoIndent )
{
if ( Shift(false) ) return true;
}
if ( event.param == KEY(TAB) && bShift && !bControl && !m_bAutoIndent )
if ( event.key.key == KEY(TAB) && bShift && !bControl && !m_bAutoIndent )
{
if ( Shift(true) ) return true;
}
if ( m_bEdit )
{
if ( event.param == KEY(LEFT) )
if ( event.key.key == KEY(LEFT) )
{
MoveChar(-1, bControl, bShift);
return true;
}
if ( event.param == KEY(RIGHT) )
if ( event.key.key == KEY(RIGHT) )
{
MoveChar(1, bControl, bShift);
return true;
}
if ( event.param == KEY(UP) )
if ( event.key.key == KEY(UP) )
{
MoveLine(-1, bControl, bShift);
return true;
}
if ( event.param == KEY(DOWN) )
if ( event.key.key == KEY(DOWN) )
{
MoveLine(1, bControl, bShift);
return true;
}
if ( event.param == KEY(PAGEUP) ) // PageUp ?
if ( event.key.key == KEY(PAGEUP) ) // PageUp ?
{
MoveLine(-(m_lineVisible-1), bControl, bShift);
return true;
}
if ( event.param == KEY(PAGEDOWN) ) // PageDown ?
if ( event.key.key == KEY(PAGEDOWN) ) // PageDown ?
{
MoveLine(m_lineVisible-1, bControl, bShift);
return true;
@ -398,62 +398,62 @@ bool CEdit::EventProcess(const Event &event)
}
else
{
if ( event.param == KEY(LEFT) ||
event.param == KEY(UP) )
if ( event.key.key == KEY(LEFT) ||
event.key.key == KEY(UP) )
{
Scroll(m_lineFirst-1, true);
return true;
}
if ( event.param == KEY(RIGHT) ||
event.param == KEY(DOWN) )
if ( event.key.key == KEY(RIGHT) ||
event.key.key == KEY(DOWN) )
{
Scroll(m_lineFirst+1, true);
return true;
}
if ( event.param == KEY(PAGEUP) ) // PageUp ?
if ( event.key.key == KEY(PAGEUP) ) // PageUp ?
{
Scroll(m_lineFirst-(m_lineVisible-1), true);
return true;
}
if ( event.param == KEY(PAGEDOWN) ) // PageDown ?
if ( event.key.key == KEY(PAGEDOWN) ) // PageDown ?
{
Scroll(m_lineFirst+(m_lineVisible-1), true);
return true;
}
}
if ( event.param == KEY(HOME) )
if ( event.key.key == KEY(HOME) )
{
MoveHome(bControl, bShift);
return true;
}
if ( event.param == KEY(END) )
if ( event.key.key == KEY(END) )
{
MoveEnd(bControl, bShift);
return true;
}
if ( event.param == KEY(BACKSPACE) ) // backspace ( <- ) ?
if ( event.key.key == KEY(BACKSPACE) ) // backspace ( <- ) ?
{
Delete(-1);
SendModifEvent();
return true;
}
if ( event.param == KEY(DELETE) )
if ( event.key.key == KEY(DELETE) )
{
Delete(1);
SendModifEvent();
return true;
}
if ( event.param == KEY(RETURN) )
if ( event.key.key == KEY(RETURN) )
{
Insert('\n');
SendModifEvent();
return true;
}
if ( event.param == KEY(TAB) )
if ( event.key.key == KEY(TAB) )
{
Insert('\t');
SendModifEvent();
@ -463,9 +463,9 @@ bool CEdit::EventProcess(const Event &event)
if ( event.type == EVENT_ACTIVE && m_bFocus )
{
if ( event.param >= ' ' && event.param <= 255 )
if ( event.key.key >= ' ' && event.key.key <= 255 )
{
Insert(static_cast<char>(event.param));
Insert(static_cast<char>(event.key.key));
SendModifEvent();
return true;
}

2
src/ui/editvalue.cpp
View File

@ -148,7 +148,7 @@ bool CEditValue::EventProcess(const Event &event)
{
if ( m_edit->GetFocus() &&
event.type == EVENT_KEY_DOWN &&
event.param == KEY(RETURN) )
event.key.key == KEY(RETURN) )
{
value = GetValue();
if ( value > m_maxValue ) value = m_maxValue;

2
src/ui/gauge.cpp
View File

@ -56,7 +56,7 @@ bool CGauge::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_BUTTON_DOWN )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
Event newEvent = event;
newEvent.type = m_eventType;

2
src/ui/interface.cpp
View File

@ -282,7 +282,7 @@ bool CInterface::EventProcess(const Event &event)
if (m_camera == nullptr) {
m_camera = static_cast<Gfx::CCamera *>(m_iMan->SearchInstance(CLASS_CAMERA));
}
m_engine->SetMouseType(m_camera->GetMouseDef(event.pos));
m_engine->SetMouseType(m_camera->GetMouseDef(event.mouseMove.pos));
}
for (int i = MAXCONTROL-1; i >= 0; i--) {

12
src/ui/key.cpp
View File

@ -83,17 +83,17 @@ bool CKey::EventProcess(const Event &event)
if (event.type == EVENT_MOUSE_BUTTON_DOWN) {
if (event.mouseButton.button == 1) // left
m_bCatch = Detect(event.pos);
m_bCatch = Detect(event.mouseButton.pos);
}
if (event.type == EVENT_MOUSE_BUTTON_DOWN && m_bCatch) {
if (event.type == EVENT_KEY_DOWN && m_bCatch) {
m_bCatch = false;
if ( TestKey(event.param) ) { // impossible ?
if ( TestKey(event.key.key) ) { // impossible ?
m_sound->Play(SOUND_TZOING);
} else {
if ( event.param == m_key[0] || event.param == m_key[1] ) {
m_key[0] = event.param;
if ( event.key.key == m_key[0] || event.key.key == m_key[1] ) {
m_key[0] = event.key.key;
m_key[1] = 0;
} else {
m_key[1] = m_key[0];
@ -129,7 +129,7 @@ bool CKey::TestKey(int key)
m_app->SetKey(i, 0, m_app->GetKey(i, 1)); // shift
m_app->SetKey(i, 1, 0);
}
}*/
} */
return false; // not used
}

2
src/ui/list.cpp
View File

@ -275,7 +275,7 @@ bool CList::EventProcess(const Event &event)
CControl::EventProcess(event);
if (event.type == EVENT_MOUSE_MOVE && Detect(event.pos)) {
if (event.type == EVENT_MOUSE_MOVE && Detect(event.mouseMove.pos)) {
m_engine->SetMouseType(Gfx::ENG_MOUSE_NORM);
for (i = 0; i < m_displayLine; i++) {
if (i + m_firstLine >= m_totalLine)

6
src/ui/map.cpp
View File

@ -189,13 +189,13 @@ bool CMap::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_MOVE && Detect(event.pos) ) {
m_engine->SetMouseType(Gfx::ENG_MOUSE_NORM);
if ( DetectObject(event.pos, bInMap) != 0 )
if ( DetectObject(event.mouseMove.pos, bInMap) != 0 )
m_engine->SetMouseType(Gfx::ENG_MOUSE_HAND);
}
if ( event.type == EVENT_MOUSE_BUTTON_DOWN && event.mouseButton.button == 1 ) {
if ( CControl::Detect(event.pos) ) {
SelectObject(event.pos);
if ( CControl::Detect(event.mouseButton.pos) ) {
SelectObject(event.mouseButton.pos);
return false;
}
}

12
src/ui/scroll.cpp
View File

@ -238,17 +238,17 @@ bool CScroll::EventProcess(const Event &event)
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
pos.y = m_pos.y+hButton;
dim.y = m_dim.y-hButton*2.0f;
pos.y += dim.y*(1.0f-m_visibleRatio)*(1.0f-m_visibleValue);
dim.y *= m_visibleRatio;
if ( event.pos.y < pos.y ||
event.pos.y > pos.y+dim.y ) // click outside cabin?
if ( event.mouseButton.pos.y < pos.y ||
event.mouseButton.pos.y > pos.y+dim.y ) // click outside cabin?
{
h = (m_dim.y-hButton*2.0f)*(1.0f-m_visibleRatio);
value = 1.0f-(event.pos.y-(m_pos.y+hButton+dim.y*0.5f))/h;
value = 1.0f-(event.mouseButton.pos.y-(m_pos.y+hButton+dim.y*0.5f))/h;
if ( value < 0.0f ) value = 0.0f;
if ( value > 1.0f ) value = 1.0f;
m_visibleValue = value;
@ -259,7 +259,7 @@ bool CScroll::EventProcess(const Event &event)
m_event->AddEvent(newEvent);
}
m_bCapture = true;
m_pressPos = event.pos;
m_pressPos = event.mouseButton.pos;
m_pressValue = m_visibleValue;
}
}
@ -269,7 +269,7 @@ bool CScroll::EventProcess(const Event &event)
h = (m_dim.y-hButton*2.0f)*(1.0f-m_visibleRatio);
if ( h != 0 )
{
value = m_pressValue - (event.pos.y-m_pressPos.y)/h;
value = m_pressValue - (event.mouseMove.pos.y-m_pressPos.y)/h;
if ( value < 0.0f ) value = 0.0f;
if ( value > 1.0f ) value = 1.0f;

2
src/ui/shortcut.cpp
View File

@ -69,7 +69,7 @@ bool CShortcut::EventProcess(const Event &event)
if ( event.type == EVENT_MOUSE_BUTTON_DOWN &&
event.mouseButton.button == 1)
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
Event newEvent = event;
newEvent.type = m_eventType;

12
src/ui/slider.cpp
View File

@ -288,20 +288,20 @@ bool CSlider::EventProcess(const Event &event)
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
if ( m_bHoriz )
{
pos.x = m_pos.x+m_marginButton;
dim.x = m_dim.x-m_marginButton*2.0f;
value = (event.pos.x-pos.x-CURSOR_WIDTH/2.0f);
value = (event.mouseButton.pos.x-pos.x-CURSOR_WIDTH/2.0f);
value /= (dim.x-CURSOR_WIDTH);
}
else
{
pos.y = m_pos.y+m_marginButton;
dim.y = m_dim.y-m_marginButton*2.0f;
value = (event.pos.y-pos.y-CURSOR_WIDTH/2.0f);
value = (event.mouseButton.pos.y-pos.y-CURSOR_WIDTH/2.0f);
value /= (dim.y-CURSOR_WIDTH);
}
if ( value < 0.0f ) value = 0.0f;
@ -314,7 +314,7 @@ bool CSlider::EventProcess(const Event &event)
m_event->AddEvent(newEvent);
m_bCapture = true;
m_pressPos = event.pos;
m_pressPos = event.mouseButton.pos;
m_pressValue = m_visibleValue;
}
}
@ -325,14 +325,14 @@ bool CSlider::EventProcess(const Event &event)
{
pos.x = m_pos.x+m_marginButton;
dim.x = m_dim.x-m_marginButton*2.0f;
value = (event.pos.x-pos.x-CURSOR_WIDTH/2.0f);
value = (event.mouseMove.pos.x-pos.x-CURSOR_WIDTH/2.0f);
value /= (dim.x-CURSOR_WIDTH);
}
else
{
pos.y = m_pos.y+m_marginButton;
dim.y = m_dim.y-m_marginButton*2.0f;
value = (event.pos.y-pos.y-CURSOR_WIDTH/2.0f);
value = (event.mouseMove.pos.y-pos.y-CURSOR_WIDTH/2.0f);
value /= (dim.y-CURSOR_WIDTH);
}
if ( value < 0.0f ) value = 0.0f;

6
src/ui/target.cpp
View File

@ -96,9 +96,9 @@ bool CTarget::EventProcess(const Event &event)
{
m_main->SetFriendAim(false);
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseMove.pos) )
{
pObj = DetectFriendObject(event.pos);
pObj = DetectFriendObject(event.mouseMove.pos);
if ( pObj == 0 )
{
m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET);
@ -121,7 +121,7 @@ bool CTarget::EventProcess(const Event &event)
(m_state & STATE_VISIBLE) &&
(m_state & STATE_ENABLE) )
{
if ( CControl::Detect(event.pos) )
if ( CControl::Detect(event.mouseButton.pos) )
{
if ( !m_main->GetFriendAim() )
{