RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 19:42:43 +00:00
Code Issues Activity Actions

LibGUI: Remove more header dependencies from Widget.h

Browse source
This commit is contained in:
Andreas Kling 2020-02-15 00:24:14 +01:00
parent 69400c2ca1
commit e1ff4fa034
12 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Applications/FontEditor/FontEditor.cpp
View file

@ -36,6 +36,7 @@
#include <LibGUI/Painter.h>
#include <LibGUI/SpinBox.h>
#include <LibGUI/TextBox.h>
#include <LibGfx/Font.h>
#include <stdlib.h>
FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::Font>&& edited_font, GUI::Widget* parent)

3
Demos/Fire/Fire.cpp
View file

@ -42,12 +42,13 @@
* [ ] handle fire bitmap edges better
*/
#include <LibGfx/Bitmap.h>
#include <LibCore/ElapsedTimer.h>
#include <LibGUI/Application.h>
#include <LibGUI/Label.h>
#include <LibGUI/Painter.h>
#include <LibGUI/Widget.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>

1
DevTools/HackStudio/EditorWrapper.cpp
View file

@ -30,6 +30,7 @@
#include <LibGUI/BoxLayout.h>
#include <LibGUI/InputBox.h>
#include <LibGUI/Label.h>
#include <LibGfx/Font.h>
extern RefPtr<EditorWrapper> g_current_editor_wrapper;

1
Libraries/LibGUI/CppSyntaxHighlighter.cpp
View file

@ -1,6 +1,7 @@
#include <LibGUI/CppLexer.h>
#include <LibGUI/CppSyntaxHighlighter.h>
#include <LibGUI/TextEditor.h>
#include <LibGfx/Font.h>
namespace GUI {

1
Libraries/LibGUI/InputBox.cpp
View file

@ -29,6 +29,7 @@
#include <LibGUI/InputBox.h>
#include <LibGUI/Label.h>
#include <LibGUI/TextEditor.h>
#include <LibGfx/Font.h>
#include <stdio.h>
namespace GUI {

2
Libraries/LibGUI/TextDocument.h
View file

@ -36,7 +36,7 @@
#include <LibGUI/TextRange.h>
#include <LibGUI/UndoStack.h>
#include <LibGfx/Color.h>
#include <LibGfx/Font.h>
#include <LibGfx/Forward.h>
namespace GUI {

11
Libraries/LibGUI/TextEditor.cpp
View file

@ -38,6 +38,7 @@
#include <LibGUI/TextEditor.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Font.h>
#include <LibGfx/Palette.h>
#include <ctype.h>
#include <fcntl.h>
@ -1500,4 +1501,14 @@ void TextEditor::set_syntax_highlighter(OwnPtr<SyntaxHighlighter> highlighter)
}
}
int TextEditor::line_height() const
{
return font().glyph_height() + m_line_spacing;
}
int TextEditor::glyph_width() const
{
return font().glyph_width('x');
}
}

7
Libraries/LibGUI/TextEditor.h
View file

@ -30,11 +30,12 @@
#include <AK/HashMap.h>
#include <AK/NonnullOwnPtrVector.h>
#include <AK/NonnullRefPtrVector.h>
#include <LibCore/ElapsedTimer.h>
#include <LibCore/Timer.h>
#include <LibGfx/TextAlignment.h>
#include <LibGUI/ScrollableWidget.h>
#include <LibGUI/TextDocument.h>
#include <LibGUI/TextRange.h>
#include <LibGfx/TextAlignment.h>
namespace GUI {
@ -89,11 +90,11 @@ public:
void scroll_position_into_view(const TextPosition&);
size_t line_count() const { return document().line_count(); }
int line_spacing() const { return m_line_spacing; }
int line_height() const { return font().glyph_height() + m_line_spacing; }
int line_height() const;
TextPosition cursor() const { return m_cursor; }
TextRange normalized_selection() const { return m_selection.normalized(); }
// FIXME: This should take glyph spacing into account, no?
int glyph_width() const { return font().glyph_width('x'); }
int glyph_width() const;
void insert_at_cursor_or_replace_selection(const StringView&);
bool write_to_file(const StringView& path);

1
Libraries/LibGUI/Widget.cpp
View file

@ -45,6 +45,7 @@
#include <LibGUI/Window.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Font.h>
#include <LibGfx/Palette.h>
#include <unistd.h>

2
Libraries/LibGUI/Widget.h
View file

@ -29,10 +29,8 @@
#include <AK/Badge.h>
#include <AK/HashMap.h>
#include <AK/String.h>
#include <LibCore/ElapsedTimer.h>
#include <LibCore/Object.h>
#include <LibGUI/Event.h>
#include <LibGUI/Shortcut.h>
#include <LibGfx/Color.h>
#include <LibGfx/Forward.h>
#include <LibGfx/Orientation.h>

1
Libraries/LibHTML/DOM/HTMLInputElement.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibCore/ElapsedTimer.h>
#include <LibGUI/Button.h>
#include <LibGUI/TextBox.h>
#include <LibHTML/DOM/Document.h>

3
Libraries/LibVT/TerminalWidget.h
View file

@ -28,11 +28,12 @@
#include <AK/String.h>
#include <LibCore/ConfigFile.h>
#include <LibCore/ElapsedTimer.h>
#include <LibCore/Notifier.h>
#include <LibCore/Timer.h>
#include <LibGUI/Frame.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Rect.h>
#include <LibGUI/Frame.h>
#include <LibVT/Terminal.h>
namespace GUI {