beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

HexEditor: Change cursor type from caret to black box

Browse source 
This patch changes cursor type from caret to black box for both Hex and
Text modes, because right now the way how blinking caret looks like is
more closer to "insert" mode in similar editors, whereas the real
behavior of this cursor is more of a "replace" mode seen in similar
editors like GHex.
This commit is contained in:
tetektoza 2023-12-15 00:23:33 +01:00 committed by Andreas Kling
parent 1ea675a9ec
commit c4c9971ed0
Notes: sideshowbarker 2024-07-17 10:08:28 +09:00 
Author: https://github.com/tetektoza
Commit: https://github.com/SerenityOS/serenity/commit/c4c9971ed0
Pull-request: https://github.com/SerenityOS/serenity/pull/22309
Reviewed-by: https://github.com/LucasChollet
2 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Userland/Applications/HexEditor/HexEditor.cpp
View file

@ -156,7 +156,7 @@ ErrorOr<void> HexEditor::save()
return {};
}
size_t HexEditor::selection_size()
size_t HexEditor::selection_size() const
{
if (!has_selection())
return 0;
@ -638,12 +638,20 @@ void HexEditor::paint_event(GUI::PaintEvent& event)
bool const selection_inbetween_end_start = byte_position >= m_selection_end && byte_position < m_selection_start;
bool const highlight_flag = selection_inbetween_start_end || selection_inbetween_end_start;
Gfx::IntRect hex_display_rect {
Gfx::IntRect hex_display_rect_high_nibble {
frame_thickness() + offset_margin_width() + j * cell_width() + 2 * m_padding,
frame_thickness() + m_padding + i * line_height(),
cell_width(),
cell_width() / 2,
line_height() - m_line_spacing
};
Gfx::IntRect hex_display_rect_low_nibble {
static_cast<int>(hex_display_rect_high_nibble.x() + character_width()),
hex_display_rect_high_nibble.y(),
hex_display_rect_high_nibble.width(),
hex_display_rect_high_nibble.height()
};
Gfx::IntRect background_rect {
frame_thickness() + offset_margin_width() + j * cell_width() + 1 * m_padding,
frame_thickness() + m_line_spacing / 2 + i * line_height(),
@ -653,6 +661,8 @@ void HexEditor::paint_event(GUI::PaintEvent& event)
u8 const cell_value = m_document->get(byte_position).value;
auto line = String::formatted("{:02X}", cell_value).release_value_but_fixme_should_propagate_errors();
auto high_nibble = line.substring_from_byte_offset(0, 1).release_value_but_fixme_should_propagate_errors();
auto low_nibble = line.substring_from_byte_offset(1).release_value_but_fixme_should_propagate_errors();
Gfx::Color background_color = palette().color(background_role());
Gfx::Color text_color = [&]() -> Gfx::Color {
@ -665,27 +675,33 @@ void HexEditor::paint_event(GUI::PaintEvent& event)
if (highlight_flag) {
background_color = edited_flag ? palette().selection().inverted() : palette().selection();
text_color = edited_flag ? palette().selection_text().inverted() : palette().selection_text();
text_color = edited_flag ? text_color : palette().selection_text();
} else if (byte_position == m_position && m_edit_mode == EditMode::Text) {
background_color = palette().inactive_selection();
text_color = palette().inactive_selection_text();
}
painter.fill_rect(background_rect, background_color);
painter.draw_text(hex_display_rect, line, Gfx::TextAlignment::TopLeft, text_color);
if (m_edit_mode == EditMode::Hex) {
if (byte_position == m_position) {
Gfx::IntRect cursor_position_rect {
static_cast<int>(hex_display_rect.left() + m_cursor_at_low_nibble * character_width()),
hex_display_rect.top(),
2,
hex_display_rect.height()
static_cast<int>(hex_display_rect_high_nibble.left() + m_cursor_at_low_nibble * character_width()),
static_cast<int>(frame_thickness() + m_line_spacing / 2 + i * line_height()),
static_cast<int>(character_width()),
static_cast<int>(line_height())
};
painter.fill_rect(cursor_position_rect, palette().text_cursor());
painter.fill_rect(cursor_position_rect, palette().black());
}
}
if (byte_position == m_position && !edited_flag) {
painter.draw_text(hex_display_rect_high_nibble, high_nibble, Gfx::TextAlignment::TopLeft, m_cursor_at_low_nibble ? text_color : palette().selection_text());
painter.draw_text(hex_display_rect_low_nibble, low_nibble, Gfx::TextAlignment::TopLeft, m_cursor_at_low_nibble ? palette().selection_text() : text_color);
} else {
painter.draw_text(hex_display_rect_high_nibble, high_nibble, Gfx::TextAlignment::TopLeft, text_color);
painter.draw_text(hex_display_rect_low_nibble, low_nibble, Gfx::TextAlignment::TopLeft, text_color);
}
Gfx::IntRect text_display_rect {
frame_thickness() + offset_margin_width() + bytes_per_row() * cell_width() + j * character_width() + 4 * m_padding,
frame_thickness() + m_padding + i * line_height(),
@ -718,16 +734,23 @@ void HexEditor::paint_event(GUI::PaintEvent& event)
painter.fill_rect(text_background_rect, background_color);
auto character = String::formatted("{:c}", isprint(cell_value) ? cell_value : '.').release_value_but_fixme_should_propagate_errors();
painter.draw_text(text_display_rect, character, Gfx::TextAlignment::TopLeft, text_color);
if (m_edit_mode == EditMode::Text) {
if (byte_position == m_position) {
Gfx::IntRect cursor_position_rect {
text_display_rect.left(), text_display_rect.top(), 2, text_display_rect.height()
text_display_rect.left(),
static_cast<int>(frame_thickness() + m_line_spacing / 2 + i * line_height()),
static_cast<int>(character_width()),
static_cast<int>(line_height())
};
painter.fill_rect(cursor_position_rect, palette().text_cursor());
painter.fill_rect(cursor_position_rect, palette().black());
}
}
if (byte_position == m_position)
painter.draw_text(text_display_rect, character, Gfx::TextAlignment::TopLeft, palette().selection_text());
else
painter.draw_text(text_display_rect, character, Gfx::TextAlignment::TopLeft, text_color);
}
}
}

2
Userland/Applications/HexEditor/HexEditor.h
View file

@ -48,7 +48,7 @@ public:
void select_all();
bool has_selection() const { return m_selection_start < m_selection_end && m_document->size() > 0; }
size_t selection_size();
size_t selection_size() const;
size_t selection_start_offset() const { return m_selection_start; }
bool copy_selected_text_to_clipboard();
bool copy_selected_hex_to_clipboard();