RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:07:35 +00:00
Code Issues Activity Actions

More moving towards using signed types.

Browse source 
I'm still feeling this out, but I am starting to like the general idea.
This commit is contained in:
Andreas Kling 2019-02-25 22:06:55 +01:00
parent beda478821
commit 9624b54703
48 changed files with 234 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LibGUI/GEventLoop.cpp
View file

@ -426,7 +426,7 @@ bool GEventLoop::wait_for_specific_event(WSAPI_ServerMessage::Type type, WSAPI_S
bool success = drain_messages_from_server();
if (!success)
return false;
for (size_t i = 0; i < m_unprocessed_messages.size(); ++i) {
for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
if (m_unprocessed_messages[i].type == type) {
event = move(m_unprocessed_messages[i]);
m_unprocessed_messages.remove(i);

8
LibGUI/GMenu.cpp
View file

@ -43,14 +43,14 @@ int GMenu::realize_menu()
{
WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::CreateMenu;
ASSERT(m_name.length() < sizeof(request.text));
ASSERT(m_name.length() < (ssize_t)sizeof(request.text));
strcpy(request.text, m_name.characters());
request.text_length = m_name.length();
auto response = GEventLoop::main().sync_request(request, WSAPI_ServerMessage::Type::DidCreateMenu);
m_menu_id = response.menu.menu_id;
ASSERT(m_menu_id > 0);
for (size_t i = 0; i < m_items.size(); ++i) {
for (int i = 0; i < m_items.size(); ++i) {
auto& item = *m_items[i];
if (item.type() == GMenuItem::Separator) {
WSAPI_ClientMessage request;
@ -65,7 +65,7 @@ int GMenu::realize_menu()
request.type = WSAPI_ClientMessage::Type::AddMenuItem;
request.menu.menu_id = m_menu_id;
request.menu.identifier = i;
ASSERT(action.text().length() < sizeof(request.text));
ASSERT(action.text().length() < (ssize_t)sizeof(request.text));
strcpy(request.text, action.text().characters());
request.text_length = action.text().length();
GEventLoop::main().sync_request(request, WSAPI_ServerMessage::Type::DidAddMenuItem);
@ -87,7 +87,7 @@ void GMenu::unrealize_menu()
m_menu_id = 0;
}
GAction* GMenu::action_at(size_t index)
GAction* GMenu::action_at(int index)
{
if (index >= m_items.size())
return nullptr;

2
LibGUI/GMenu.h
View file

@ -13,7 +13,7 @@ public:
static GMenu* from_menu_id(int);
GAction* action_at(size_t);
GAction* action_at(int);
void add_action(RetainPtr<GAction>&&);
void add_separator();

2
LibGUI/GObject.cpp
View file

@ -43,7 +43,7 @@ void GObject::add_child(GObject& object)
void GObject::remove_child(GObject& object)
{
for (unsigned i = 0; i < m_children.size(); ++i) {
for (ssize_t i = 0; i < m_children.size(); ++i) {
if (m_children[i] == &object) {
m_children.remove(i);
return;

6
LibGUI/GTextBox.cpp
View file

@ -35,13 +35,13 @@ void GTextBox::paint_event(GPaintEvent&)
Rect inner_rect = rect();
inner_rect.shrink(6, 6);
size_t max_chars_to_paint = inner_rect.width() / font().glyph_width();
ssize_t max_chars_to_paint = inner_rect.width() / font().glyph_width();
int first_visible_char = max((int)m_cursor_position - (int)max_chars_to_paint, 0);
size_t chars_to_paint = min(m_text.length() - first_visible_char, max_chars_to_paint);
ssize_t chars_to_paint = min(m_text.length() - first_visible_char, max_chars_to_paint);
int y = inner_rect.center().y() - font().glyph_height() / 2;
for (size_t i = 0; i < chars_to_paint; ++i) {
for (ssize_t i = 0; i < chars_to_paint; ++i) {
char ch = m_text[first_visible_char + i];
if (ch == ' ')
continue;

2
LibGUI/GTextBox.h
View file

@ -27,7 +27,7 @@ private:
void handle_backspace();
String m_text;
unsigned m_cursor_position { 0 };
int m_cursor_position { 0 };
bool m_cursor_blink_state { false };
};

10
LibGUI/GWindow.cpp
View file

@ -63,7 +63,7 @@ void GWindow::show()
request.window.opacity = m_opacity_when_windowless;
request.window.size_increment = m_size_increment;
request.window.base_size = m_base_size;
ASSERT(m_title_when_windowless.length() < sizeof(request.text));
ASSERT(m_title_when_windowless.length() < (ssize_t)sizeof(request.text));
strcpy(request.text, m_title_when_windowless.characters());
request.text_length = m_title_when_windowless.length();
auto response = GEventLoop::main().sync_request(request, WSAPI_ServerMessage::Type::DidCreateWindow);
@ -81,9 +81,6 @@ void GWindow::hide()
WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::DestroyWindow;
request.window_id = m_window_id;
ASSERT(m_title_when_windowless.length() < sizeof(request.text));
strcpy(request.text, m_title_when_windowless.characters());
request.text_length = m_title_when_windowless.length();
GEventLoop::main().post_message_to_server(request);
}
@ -96,7 +93,7 @@ void GWindow::set_title(String&& title)
WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::SetWindowTitle;
request.window_id = m_window_id;
ASSERT(m_title_when_windowless.length() < sizeof(request.text));
ASSERT(m_title_when_windowless.length() < (ssize_t)sizeof(request.text));
strcpy(request.text, m_title_when_windowless.characters());
request.text_length = m_title_when_windowless.length();
GEventLoop::main().post_message_to_server(request);
@ -110,9 +107,6 @@ String GWindow::title() const
WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::GetWindowTitle;
request.window_id = m_window_id;
ASSERT(m_title_when_windowless.length() < sizeof(request.text));
strcpy(request.text, m_title_when_windowless.characters());
request.text_length = m_title_when_windowless.length();
auto response = GEventLoop::main().sync_request(request, WSAPI_ServerMessage::Type::DidGetWindowTitle);
return String(response.text, response.text_length);
}