Skip to content

Commit

Permalink
fine tune pwd gen app layout (#2277)
Browse files Browse the repository at this point in the history
* init

* format
  • Loading branch information
zxkmm authored Oct 1, 2024
1 parent a398ed1 commit 2d1314a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ void RandomPasswordView::new_password() {
text_generated_passwd.set(password);
text_char_type_hints.set(char_type_hints);

paint_password_hints(); // TODO: why flash and disappeared
paint_password_hints();

if (logger && logging) {
str_log += generate_log_line();
Expand All @@ -309,7 +309,7 @@ void RandomPasswordView::new_password() {
if (check_auto_send.value() || flooding) {
async_prev_val = portapack::async_tx_enabled;
portapack::async_tx_enabled = true;
// printing out seeds buufer
// printing out seeds buffer
// for (auto seed : seeds_deque) {
// UsbSerialAsyncmsg::asyncmsg(std::to_string(seed));
// }
Expand All @@ -320,18 +320,11 @@ void RandomPasswordView::new_password() {
clean_buffer();
}

// tried:
// 1. paint inline in new_password func
// 2. paint in a seperate func and call from new_password
// 3. override nav's paint func (i think it can tried to capture same obj) and paint, hoping set_dirty handle it correctly
// 4. override nav's paint func (i think it can tried to capture same obj) and paint in a seperate func, hoping set_dirty handle it correctly
// all these methods failed, and all of them only flash and disappeared. only when set_dirty in on_data (which seems incorrect), and it keep flashing never stop. but see painted content (flashing too)
// btw this is not caused by the seed text set thing, cuz commented it out not helping.
void RandomPasswordView::paint_password_hints() {
Painter painter;
const int char_width = 8;
const int char_height = 16;
const int start_y = 7 * char_height + 5;
const int start_y = 6 * char_height;
const int rect_height = 4;

for (size_t i = 0; i < password.length(); i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using namespace ui;

namespace ui::external_app::random_password {

class RandomPasswordLogger { // TODO: log is broken after introduced the buffer thing
class RandomPasswordLogger {
public:
Optional<File::Error> append(const std::filesystem::path& filename) {
return log_file.append(filename);
Expand Down Expand Up @@ -126,7 +126,7 @@ class RandomPasswordView : public View {
"000000000000000000000000000000"};

Text text_char_type_hints{
{0, 5 * 16, screen_width, 16},
{0, 5 * 16 + 4, screen_width, 16},
"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"};

Checkbox check_show_seeds{
Expand Down
2 changes: 2 additions & 0 deletions firmware/common/ui_widget.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ class Widget {
};

class View : public Widget {
// unlike Paint class, our Y ignored the top bar;
// so when you draw some of us as Y = 0, it would be exact below the top bar, instead of overlapped with top bar
public:
View() {
}
Expand Down

0 comments on commit 2d1314a

Please sign in to comment.