Bugfix: call "updateButtonText()" after a joystick or mouse control is set.
That way, the "Calibrate" button is updated. git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@1717 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 2ddb1d25d04308aab68613422ab66500ed0e9609 Former-commit-id: ae701c617139821917b08cbc317b131bbee541a8
This commit is contained in:
parent
41d972fa10
commit
728f664ea8
1 changed files with 4 additions and 0 deletions
|
@ -313,6 +313,7 @@ Idle(void)
|
||||||
Cmd[CurrentCmd].ref.type = GFCTRL_TYPE_MOUSE_BUT;
|
Cmd[CurrentCmd].ref.type = GFCTRL_TYPE_MOUSE_BUT;
|
||||||
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
||||||
glutPostRedisplay();
|
glutPostRedisplay();
|
||||||
|
updateButtonText();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -327,6 +328,7 @@ Idle(void)
|
||||||
Cmd[CurrentCmd].ref.type = GFCTRL_TYPE_MOUSE_AXIS;
|
Cmd[CurrentCmd].ref.type = GFCTRL_TYPE_MOUSE_AXIS;
|
||||||
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
||||||
glutPostRedisplay();
|
glutPostRedisplay();
|
||||||
|
updateButtonText();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -348,6 +350,7 @@ Idle(void)
|
||||||
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
||||||
glutPostRedisplay();
|
glutPostRedisplay();
|
||||||
JoyButtons[index] = b;
|
JoyButtons[index] = b;
|
||||||
|
updateButtonText();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -365,6 +368,7 @@ Idle(void)
|
||||||
str = GfctrlGetNameByRef(GFCTRL_TYPE_JOY_AXIS, axis);
|
str = GfctrlGetNameByRef(GFCTRL_TYPE_JOY_AXIS, axis);
|
||||||
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
GfuiButtonSetText (ScrHandle, Cmd[CurrentCmd].Id, str);
|
||||||
glutPostRedisplay();
|
glutPostRedisplay();
|
||||||
|
updateButtonText();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue