Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PasswordField widget #133

Merged
merged 5 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ widget_headers = [
'include/guisan/widgets/label.hpp',
'include/guisan/widgets/listbox.hpp',
'include/guisan/widgets/messagebox.hpp',
'include/guisan/widgets/passwordfield.hpp',
'include/guisan/widgets/progressbar.hpp',
'include/guisan/widgets/radiobutton.hpp',
'include/guisan/widgets/scrollarea.hpp',
Expand Down
4 changes: 4 additions & 0 deletions examples/widgets_example.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ namespace WidgetsExample

textField = std::make_unique<gcn::TextField>("Text field");

passwordField = std::make_unique<gcn::PasswordField>("password");

textBox = std::make_unique<gcn::TextBox>("Lorem ipsum dolor sit amet consectetur\n"
"adipiscing elit Integer vitae ultrices\n"
"eros Curabitur malesuada dolor imperdieat\n"
Expand Down Expand Up @@ -150,6 +152,7 @@ namespace WidgetsExample
top->add(imageButton.get(), 10, 290);
top->add(imageTextButton.get(), 10, 380);
top->add(textField.get(), 375, 10);
top->add(passwordField.get(), 425, 10);
top->add(textBoxScrollArea.get(), 290, 50);
top->add(inputBox.get(), 270, 180);
top->add(listBox.get(), 290, 200);
Expand Down Expand Up @@ -228,6 +231,7 @@ namespace WidgetsExample
std::unique_ptr<gcn::ImageTextButton> imageTextButton; // An image text button
std::unique_ptr<gcn::InputBox> inputBox; // An input box
std::unique_ptr<gcn::TextField> textField; // One-line text field
std::unique_ptr<gcn::PasswordField> passwordField; // One-line password field
std::unique_ptr<gcn::TextBox> textBox; // Multi-line text box
std::unique_ptr<gcn::ScrollArea> textBoxScrollArea; // Scroll area for the text box
std::unique_ptr<gcn::ListBox> listBox; // A list box
Expand Down
1 change: 1 addition & 0 deletions include/guisan.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
#include <guisan/widgets/label.hpp>
#include <guisan/widgets/listbox.hpp>
#include <guisan/widgets/messagebox.hpp>
#include <guisan/widgets/passwordfield.hpp>
#include <guisan/widgets/progressbar.hpp>
#include <guisan/widgets/scrollarea.hpp>
#include <guisan/widgets/slider.hpp>
Expand Down
111 changes: 111 additions & 0 deletions include/guisan/widgets/passwordfield.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
* / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
* / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
* License: (BSD) <Td/Z <fP"5(\"??"\a. .L
* Redistribution and use in source and _dV>ws?a-?' ._/L #'
* binary forms, with or without )4d[#7r, . ' )d`)[
* modification, are permitted provided _Q-5'5W..j/?' -?!\)cam'
* that the following conditions are met: j<<WP+k/);. _W=j f
* 1. Redistributions of source code must .$%w\/]Q . ."' . mj$
* retain the above copyright notice, ]E.pYY(Q]>. a J@\
* this list of conditions and the j(]1u<sE"L,. . ./^ ]{a
* following disclaimer. 4'_uomm\. )L);-4 (3=
* 2. Redistributions in binary form must )_]X{Z('a_"a7'<a"a, ]"[
* reproduce the above copyright notice, #}<]m7`Za??4,P-"'7. ).m
* this list of conditions and the ]d2e)Q(<Q( ?94 b- LQ/
* following disclaimer in the <B!</]C)d_, '(<' .f. =C+m
* documentation and/or other materials .Z!=J ]e []('-4f _ ) -.)m]'
* provided with the distribution. .w[5]' _[ /.)_-"+? _/ <W"
* 3. Neither the name of Guichan nor the :$we` _! + _/ . j?
* names of its contributors may be used =3)= _f (_yQmWW$#( "
* to endorse or promote products derived - W, sQQQQmZQ#Wwa]..
* from this software without specific (js, \[QQW$QWW#?!V"".
* prior written permission. ]y:.<\.. .
* -]n w/ ' [.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT )/ )/ !
* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY < (; sac , '
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, ]^ .- %
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF c < r
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR aga< <La
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 5% )P'-3L
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR _bQf` y`..)a
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ,J?4P'.P"_(\?d'.,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES _Pa,)!f/<[]/ ?"
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT _2-..:. .r+_,.. .
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ?a.<%"' " -'.a_ _,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ^
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef GCN_PASSWORDFIELD_HPP
#define GCN_PASSWORDFIELD_HPP

#include "guisan/widgets/textfield.hpp"

#include <string>

namespace gcn
{
/**
* A text field in which you can write or display a line of text.
* Unlike a TextField the text will appear as masked, instead of the real content.
* If for some reason the Font you are using does not contain the character, the
* PasswordField will be filled by spaces.
*/
class GCN_CORE_DECLSPEC PasswordField:
public TextField
{
public:
/**
* Default constructor.
*/
PasswordField();

/**
* Constructor. Initializes the passwordfield with a given string.
*
* @param text the initial text.
*/
explicit PasswordField(const std::string& text);

// Inherited from Widget

void draw(Graphics* graphics) override;

/**
* Set the masking character to hide the password
*
* @param mask the masking character
*/
void setMaskingChar(const char mask);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getter might be useful too.


/**
* Get the masking character
*
* @return the masking character
*/
const char getMaskingChar() const;

private:
char masking = '*';
};
}

#endif // end GCN_PASSWORDFIELD_HPP
1 change: 1 addition & 0 deletions src/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ widget_sources = [
'widgets/label.cpp',
'widgets/listbox.cpp',
'widgets/messagebox.cpp',
'widgets/passwordfield.cpp',
'widgets/progressbar.cpp',
'widgets/radiobutton.cpp',
'widgets/scrollarea.cpp',
Expand Down
99 changes: 99 additions & 0 deletions src/widgets/passwordfield.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
* / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
* / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
* Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
* Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
* License: (BSD) <Td/Z <fP"5(\"??"\a. .L
* Redistribution and use in source and _dV>ws?a-?' ._/L #'
* binary forms, with or without )4d[#7r, . ' )d`)[
* modification, are permitted provided _Q-5'5W..j/?' -?!\)cam'
* that the following conditions are met: j<<WP+k/);. _W=j f
* 1. Redistributions of source code must .$%w\/]Q . ."' . mj$
* retain the above copyright notice, ]E.pYY(Q]>. a J@\
* this list of conditions and the j(]1u<sE"L,. . ./^ ]{a
* following disclaimer. 4'_uomm\. )L);-4 (3=
* 2. Redistributions in binary form must )_]X{Z('a_"a7'<a"a, ]"[
* reproduce the above copyright notice, #}<]m7`Za??4,P-"'7. ).m
* this list of conditions and the ]d2e)Q(<Q( ?94 b- LQ/
* following disclaimer in the <B!</]C)d_, '(<' .f. =C+m
* documentation and/or other materials .Z!=J ]e []('-4f _ ) -.)m]'
* provided with the distribution. .w[5]' _[ /.)_-"+? _/ <W"
* 3. Neither the name of Guichan nor the :$we` _! + _/ . j?
* names of its contributors may be used =3)= _f (_yQmWW$#( "
* to endorse or promote products derived - W, sQQQQmZQ#Wwa]..
* from this software without specific (js, \[QQW$QWW#?!V"".
* prior written permission. ]y:.<\.. .
* -]n w/ ' [.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT )/ )/ !
* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY < (; sac , '
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, ]^ .- %
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF c < r
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR aga< <La
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 5% )P'-3L
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR _bQf` y`..)a
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ,J?4P'.P"_(\?d'.,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES _Pa,)!f/<[]/ ?"
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT _2-..:. .r+_,.. .
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ?a.<%"' " -'.a_ _,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ^
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
* For comments regarding functions please see the header file.
*/

#include "guisan/widgets/passwordfield.hpp"

#include "guisan/text.hpp"

namespace gcn
{
PasswordField::PasswordField() : TextField()
{

}

PasswordField::PasswordField(const std::string& text) : TextField(text)
{

}


void PasswordField::draw(Graphics* graphics)
{
const std::string realText(mText->getRow(0));
const std::string encodedText(realText.size(), masking);

// Switch replacement text before drawing it to hide it
mText->setRow(0, encodedText);
TextField::draw(graphics);
mText->setRow(0, realText);
}

void PasswordField::setMaskingChar(const char mask)
{
masking = mask;
}

const char PasswordField::getMaskingChar() const
{
return masking;
}

}