mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-09 01:46:29 +02:00
Code Issues Projects Releases Wiki Activity

Vote editing

Browse Source
This commit is contained in:
Tamás Bálint Misius
2022-09-07 12:51:06 +02:00
parent 6b133aced6
commit 86b6084baf
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Client.cpp
View File

@@ -701,7 +701,7 @@ RequestStatus Client::ExecVote(int saveID, int direction)
ByteString userIDText = ByteString::Build(authUser.UserID); ByteString userIDText = ByteString::Build(authUser.UserID);
data = http::Request::SimpleAuth(SCHEME SERVER "/Vote.api", &dataStatus, userIDText, authUser.SessionID, { data = http::Request::SimpleAuth(SCHEME SERVER "/Vote.api", &dataStatus, userIDText, authUser.SessionID, {
{ "ID", saveIDText }, { "ID", saveIDText },
{ "Action", direction == 1 ? "Up" : "Down" }, { "Action", direction ? (direction == 1 ? "Up" : "Down") : "Reset" },
}); });
} }
else else

2
src/gui/game/GameController.cpp
View File

@@ -1467,7 +1467,7 @@ void GameController::FrameStep()
void GameController::Vote(int direction) void GameController::Vote(int direction)
{ {
if(gameModel->GetSave() && gameModel->GetUser().UserID && gameModel->GetSave()->GetID() && gameModel->GetSave()->GetVote()==0) if(gameModel->GetSave() && gameModel->GetUser().UserID && gameModel->GetSave()->GetID())
{ {
try try
{ {

34
src/gui/game/GameView.cpp
View File

@@ -272,7 +272,6 @@ GameView::GameView():
upVoteButton->Appearance.Margin.Top+=2; upVoteButton->Appearance.Margin.Top+=2;
upVoteButton->Appearance.Margin.Left+=2; upVoteButton->Appearance.Margin.Left+=2;
currentX+=38; currentX+=38;
upVoteButton->SetActionCallback({ [this] { c->Vote(1); } });
AddComponent(upVoteButton); AddComponent(upVoteButton);
downVoteButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(15, 15), "", "Dislike this save"); downVoteButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(15, 15), "", "Dislike this save");
@@ -280,7 +279,6 @@ GameView::GameView():
downVoteButton->Appearance.Margin.Bottom+=2; downVoteButton->Appearance.Margin.Bottom+=2;
downVoteButton->Appearance.Margin.Left+=2; downVoteButton->Appearance.Margin.Left+=2;
currentX+=16; currentX+=16;
downVoteButton->SetActionCallback({ [this] { c->Vote(-1); } });
AddComponent(downVoteButton); AddComponent(downVoteButton);
tagSimulationButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(227, 15), "[no tags set]", "Add simulation tags"); tagSimulationButton = new ui::Button(ui::Point(currentX, Size.Y-16), ui::Point(227, 15), "[no tags set]", "Add simulation tags");
@@ -803,17 +801,29 @@ void GameView::NotifySaveChanged(GameModel * sender)
else else
saveSimulationButton->SetShowSplit(false); saveSimulationButton->SetShowSplit(false);
reloadButton->Enabled = true; reloadButton->Enabled = true;
upVoteButton->Enabled = (sender->GetSave()->GetID() && sender->GetUser().UserID && sender->GetSave()->GetVote()==0); upVoteButton->Enabled = sender->GetSave()->GetID() && sender->GetUser().UserID && sender->GetUser().Username != sender->GetSave()->GetUserName();
if(sender->GetSave()->GetID() && sender->GetUser().UserID && sender->GetSave()->GetVote()==1) if(sender->GetSave()->GetID() && sender->GetUser().UserID && sender->GetSave()->GetVote()==1)
upVoteButton->Appearance.BackgroundDisabled = (ui::Colour(0, 108, 10, 255)); {
upVoteButton->Appearance.BackgroundHover = (ui::Colour(20, 128, 30, 255));
upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 108, 10, 255));
}
else else
upVoteButton->Appearance.BackgroundDisabled = (ui::Colour(0, 0, 0)); {
upVoteButton->Appearance.BackgroundHover = (ui::Colour(20, 20, 20));
upVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0));
}
downVoteButton->Enabled = upVoteButton->Enabled; downVoteButton->Enabled = upVoteButton->Enabled;
if (sender->GetSave()->GetID() && sender->GetUser().UserID && sender->GetSave()->GetVote()==-1) if (sender->GetSave()->GetID() && sender->GetUser().UserID && sender->GetSave()->GetVote()==-1)
downVoteButton->Appearance.BackgroundDisabled = (ui::Colour(108, 0, 10, 255)); {
downVoteButton->Appearance.BackgroundHover = (ui::Colour(128, 20, 30, 255));
downVoteButton->Appearance.BackgroundInactive = (ui::Colour(108, 0, 10, 255));
}
else else
downVoteButton->Appearance.BackgroundDisabled = (ui::Colour(0, 0, 0)); {
downVoteButton->Appearance.BackgroundHover = (ui::Colour(20, 20, 20));
downVoteButton->Appearance.BackgroundInactive = (ui::Colour(0, 0, 0));
}
if (sender->GetUser().UserID) if (sender->GetUser().UserID)
{ {
@@ -826,6 +836,16 @@ void GameView::NotifySaveChanged(GameModel * sender)
downVoteButton->Appearance.BorderDisabled = ui::Colour(100, 100, 100); downVoteButton->Appearance.BorderDisabled = ui::Colour(100, 100, 100);
} }
if (sender->GetSave()->GetVote() == 1)
upVoteButton->SetActionCallback({ [this] { c->Vote(0); } });
else
upVoteButton->SetActionCallback({ [this] { c->Vote(1); } });
if (sender->GetSave()->GetVote() == -1)
downVoteButton->SetActionCallback({ [this] { c->Vote(0) ;} });
else
downVoteButton->SetActionCallback({ [this] { c->Vote(-1) ;} });
tagSimulationButton->Enabled = sender->GetSave()->GetID(); tagSimulationButton->Enabled = sender->GetSave()->GetID();
if (sender->GetSave()->GetID()) if (sender->GetSave()->GetID())
{ {