snake basket has (more) splash ; menu_state_mods a bit modified (more work needed)
This commit is contained in:
parent
56bc84923a
commit
7560970590
|
@ -55,10 +55,15 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
|
||||||
keyButtonsHeight = 20;
|
keyButtonsHeight = 20;
|
||||||
keyButtonsWidth = 200;
|
keyButtonsWidth = 200;
|
||||||
scrollListsYPos = 700;
|
scrollListsYPos = 700;
|
||||||
|
listBoxLength = 200;
|
||||||
keyButtonsYBase = scrollListsYPos;
|
keyButtonsYBase = scrollListsYPos;
|
||||||
keyButtonsToRender = 400 / keyButtonsLineHeight;
|
keyButtonsToRender = listBoxLength / keyButtonsLineHeight;
|
||||||
labelWidth = 5;
|
labelWidth = 5;
|
||||||
|
|
||||||
|
int installButtonYPos = scrollListsYPos-listBoxLength-20;
|
||||||
|
|
||||||
|
int returnLineY = 80;
|
||||||
|
|
||||||
//create
|
//create
|
||||||
techInfoXPos = 10;
|
techInfoXPos = 10;
|
||||||
keyTechScrollBarTitle1.registerGraphicComponent(containerName,"keyTechScrollBarTitle1");
|
keyTechScrollBarTitle1.registerGraphicComponent(containerName,"keyTechScrollBarTitle1");
|
||||||
|
@ -97,14 +102,17 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
|
||||||
mainMessageBox.init(lang.get("Yes"),lang.get("No"));
|
mainMessageBox.init(lang.get("Yes"),lang.get("No"));
|
||||||
mainMessageBox.setEnabled(false);
|
mainMessageBox.setEnabled(false);
|
||||||
|
|
||||||
int returnLineY = 240;
|
|
||||||
|
lineHorizontal.init(0,installButtonYPos-60);
|
||||||
|
lineVertical.init(500,returnLineY, 5, installButtonYPos-60-returnLineY);
|
||||||
|
lineVertical.setHorizontal(false);
|
||||||
lineReturn.init(0, returnLineY);
|
lineReturn.init(0, returnLineY);
|
||||||
|
|
||||||
|
|
||||||
buttonReturn.registerGraphicComponent(containerName,"buttonReturn");
|
buttonReturn.registerGraphicComponent(containerName,"buttonReturn");
|
||||||
buttonReturn.init(450, returnLineY - 40, 125);
|
buttonReturn.init(450, returnLineY - 40, 125);
|
||||||
buttonReturn.setText(lang.get("Return"));
|
buttonReturn.setText(lang.get("Return"));
|
||||||
|
|
||||||
int installButtonYPos = 280;
|
|
||||||
buttonInstallTech.registerGraphicComponent(containerName,"buttonInstallTech");
|
buttonInstallTech.registerGraphicComponent(containerName,"buttonInstallTech");
|
||||||
buttonInstallTech.init(techInfoXPos + 40, installButtonYPos, 125);
|
buttonInstallTech.init(techInfoXPos + 40, installButtonYPos, 125);
|
||||||
buttonInstallTech.setText(lang.get("Install"));
|
buttonInstallTech.setText(lang.get("Install"));
|
||||||
|
@ -135,7 +143,6 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
|
||||||
|
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
int listBoxLength = 400;
|
|
||||||
keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
|
keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
|
||||||
keyTilesetScrollBar.setLength(listBoxLength);
|
keyTilesetScrollBar.setLength(listBoxLength);
|
||||||
keyTilesetScrollBar.setElementCount(0);
|
keyTilesetScrollBar.setElementCount(0);
|
||||||
|
@ -543,8 +550,6 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
|
|
||||||
int listBoxLength = 400;
|
|
||||||
keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
|
keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
|
||||||
keyTilesetScrollBar.setLength(listBoxLength);
|
keyTilesetScrollBar.setLength(listBoxLength);
|
||||||
keyTilesetScrollBar.setElementCount(keyTilesetButtons.size());
|
keyTilesetScrollBar.setElementCount(keyTilesetButtons.size());
|
||||||
|
@ -1265,6 +1270,10 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
||||||
i <= keyMapScrollBar.getVisibleEnd(); ++i) {
|
i <= keyMapScrollBar.getVisibleEnd(); ++i) {
|
||||||
if(keyMapButtons[i]->mouseClick(x, y) && keyMapButtons[i]->getEnabled()) {
|
if(keyMapButtons[i]->mouseClick(x, y) && keyMapButtons[i]->getEnabled()) {
|
||||||
string mapName = keyMapButtons[i]->getText();
|
string mapName = keyMapButtons[i]->getText();
|
||||||
|
selectedTechName = "";
|
||||||
|
selectedTilesetName = "";
|
||||||
|
selectedMapName = "";
|
||||||
|
selectedScenarioName = "";
|
||||||
if(mapName != "") {
|
if(mapName != "") {
|
||||||
selectedMapName = mapName;
|
selectedMapName = mapName;
|
||||||
}
|
}
|
||||||
|
@ -1277,6 +1286,10 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
||||||
i <= keyTechScrollBar.getVisibleEnd(); ++i) {
|
i <= keyTechScrollBar.getVisibleEnd(); ++i) {
|
||||||
if(keyTechButtons[i]->mouseClick(x, y) && keyTechButtons[i]->getEnabled()) {
|
if(keyTechButtons[i]->mouseClick(x, y) && keyTechButtons[i]->getEnabled()) {
|
||||||
string techName = keyTechButtons[i]->getText();
|
string techName = keyTechButtons[i]->getText();
|
||||||
|
selectedTechName = "";
|
||||||
|
selectedTilesetName = "";
|
||||||
|
selectedMapName = "";
|
||||||
|
selectedScenarioName = "";
|
||||||
if(techName != "") {
|
if(techName != "") {
|
||||||
selectedTechName = techName;
|
selectedTechName = techName;
|
||||||
}
|
}
|
||||||
|
@ -1289,6 +1302,10 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
||||||
i <= keyTilesetScrollBar.getVisibleEnd(); ++i) {
|
i <= keyTilesetScrollBar.getVisibleEnd(); ++i) {
|
||||||
if(keyTilesetButtons[i]->mouseClick(x, y) && keyTilesetButtons[i]->getEnabled()) {
|
if(keyTilesetButtons[i]->mouseClick(x, y) && keyTilesetButtons[i]->getEnabled()) {
|
||||||
string tilesetName = keyTilesetButtons[i]->getText();
|
string tilesetName = keyTilesetButtons[i]->getText();
|
||||||
|
selectedTechName = "";
|
||||||
|
selectedTilesetName = "";
|
||||||
|
selectedMapName = "";
|
||||||
|
selectedScenarioName = "";
|
||||||
if(tilesetName != "") {
|
if(tilesetName != "") {
|
||||||
selectedTilesetName = tilesetName;
|
selectedTilesetName = tilesetName;
|
||||||
}
|
}
|
||||||
|
@ -1301,6 +1318,10 @@ void MenuStateMods::mouseClick(int x, int y, MouseButton mouseButton) {
|
||||||
i <= keyScenarioScrollBar.getVisibleEnd(); ++i) {
|
i <= keyScenarioScrollBar.getVisibleEnd(); ++i) {
|
||||||
if(keyScenarioButtons[i]->mouseClick(x, y) && keyScenarioButtons[i]->getEnabled()) {
|
if(keyScenarioButtons[i]->mouseClick(x, y) && keyScenarioButtons[i]->getEnabled()) {
|
||||||
string scenarioName = keyScenarioButtons[i]->getText();
|
string scenarioName = keyScenarioButtons[i]->getText();
|
||||||
|
selectedTechName = "";
|
||||||
|
selectedTilesetName = "";
|
||||||
|
selectedMapName = "";
|
||||||
|
selectedScenarioName = "";
|
||||||
if(scenarioName != "") {
|
if(scenarioName != "") {
|
||||||
selectedScenarioName = scenarioName;
|
selectedScenarioName = scenarioName;
|
||||||
}
|
}
|
||||||
|
@ -1370,6 +1391,8 @@ void MenuStateMods::render() {
|
||||||
try {
|
try {
|
||||||
Renderer &renderer= Renderer::getInstance();
|
Renderer &renderer= Renderer::getInstance();
|
||||||
|
|
||||||
|
renderer.renderLine(&lineHorizontal);
|
||||||
|
renderer.renderLine(&lineVertical);
|
||||||
renderer.renderLine(&lineReturn);
|
renderer.renderLine(&lineReturn);
|
||||||
renderer.renderButton(&buttonReturn);
|
renderer.renderButton(&buttonReturn);
|
||||||
|
|
||||||
|
@ -1400,6 +1423,7 @@ void MenuStateMods::render() {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Vec4f fontColor=Vec4f(200.0f/255.0f, 187.0f/255.0f, 190.0f/255.0f, 0.75f);
|
Vec4f fontColor=Vec4f(200.0f/255.0f, 187.0f/255.0f, 190.0f/255.0f, 0.75f);
|
||||||
|
//Vec4f fontColor=Vec4f(1.0f, 0.0f, 0.0f, 0.75f);
|
||||||
renderer.renderButton(keyTechButtons[i],&fontColor);
|
renderer.renderButton(keyTechButtons[i],&fontColor);
|
||||||
}
|
}
|
||||||
renderer.renderLabel(labelsTech[i]);
|
renderer.renderLabel(labelsTech[i]);
|
||||||
|
|
|
@ -42,6 +42,8 @@ class MenuStateMods: public MenuState, public FTPClientCallbackInterface, public
|
||||||
private:
|
private:
|
||||||
|
|
||||||
GraphicButton buttonReturn;
|
GraphicButton buttonReturn;
|
||||||
|
GraphicLine lineHorizontal;
|
||||||
|
GraphicLine lineVertical;
|
||||||
GraphicLine lineReturn;
|
GraphicLine lineReturn;
|
||||||
|
|
||||||
GraphicMessageBox mainMessageBox;
|
GraphicMessageBox mainMessageBox;
|
||||||
|
@ -53,6 +55,7 @@ private:
|
||||||
int scenarioInfoXPos;
|
int scenarioInfoXPos;
|
||||||
int labelWidth;
|
int labelWidth;
|
||||||
int scrollListsYPos;
|
int scrollListsYPos;
|
||||||
|
int listBoxLength;
|
||||||
|
|
||||||
GraphicButton buttonInstallTech;
|
GraphicButton buttonInstallTech;
|
||||||
GraphicButton buttonRemoveTech;
|
GraphicButton buttonRemoveTech;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user