matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix comments being deleted when hitting enter and opening a save or getting an error when commenting

Browse Source
This commit is contained in:
jacob1 2012-12-15 22:55:53 -05:00
parent 1ef507d9e6
commit 462bd7bdf9
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/preview/PreviewController.cpp
View File

@ -84,11 +84,12 @@ void PreviewController::Update()
}
}
void PreviewController::SubmitComment(std::string comment)
bool PreviewController::SubmitComment(std::string comment)
{
if(comment.length() < 4)
{
new ErrorMessage("Error", "Comment is too short");
return false;
}
else
{
@ -96,12 +97,14 @@ void PreviewController::SubmitComment(std::string comment)
if(status != RequestOkay)
{
new ErrorMessage("Error Submitting comment", Client::Ref().GetLastError());
return false;
}
else
{
previewModel->UpdateComments(1);
}
}
return true;
}
void PreviewController::ShowLogin()

2
src/preview/PreviewController.h
View File

@ -41,7 +41,7 @@ public:
PreviewView * GetView() { return previewView; }
void Update();
void FavouriteSave();
void SubmitComment(std::string comment);
bool SubmitComment(std::string comment);
void NextCommentPage();
void PrevCommentPage();

13
src/preview/PreviewView.cpp
View File

@ -19,6 +19,7 @@
#include "search/Thumbnail.h"
#include "client/Client.h"
#include "interface/ScrollPanel.h"
#include "interface/Keys.h"
class PreviewView::LoginAction: public ui::ButtonAction
{
@ -121,7 +122,6 @@ PreviewView::PreviewView():
openButton->SetIcon(IconOpen);
openButton->SetActionCallback(new OpenAction(this));
AddComponent(openButton);
SetOkayButton(openButton);
class BrowserOpenAction: public ui::ButtonAction
{
@ -363,6 +363,12 @@ void PreviewView::OnMouseWheel(int x, int y, int d)
}
void PreviewView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
if ((key == KEY_ENTER || key == KEY_RETURN) && !addCommentBox->IsFocused())
openButton->DoAction();
}
void PreviewView::NotifySaveChanged(PreviewModel * sender)
{
SaveInfo * save = sender->GetSave();
@ -429,10 +435,11 @@ void PreviewView::submitComment()
std::string comment = std::string(addCommentBox->GetText());
submitCommentButton->Enabled = false;
addCommentBox->SetText("");
addCommentBox->SetPlaceholder("Submitting comment");
addCommentBox->SetPlaceholder("Submitting comment"); //This doesn't appear to ever show since no separate thread is created
FocusComponent(NULL);
c->SubmitComment(comment);
if (!c->SubmitComment(comment))
addCommentBox->SetText(comment);
addCommentBox->SetPlaceholder("Add comment");
submitCommentButton->Enabled = true;

1
src/preview/PreviewView.h
View File

@ -72,6 +72,7 @@ public:
virtual void OnTick(float dt);
virtual void OnTryExit(ExitMethod method);
virtual void OnMouseWheel(int x, int y, int d);
virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt);
virtual ~PreviewView();
};