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

LibGUI+PaintBrush: Fix to GFilePicker and PaintBrush enhancements.

Browse source 
GFilePicker
- Fixed GFilePicker to use new ref-counted construct method to stop crashing on open dialog.
  - PaintBrush is still crashing on open dialog due to an unrelated issue.

PaintBrush
- Created 16x16 icon for PaintBrush
- Moved Open option into App menu.
- Changed help menu to make use of the standardized About dialog.
This commit is contained in:
Brandon Scott 2019-10-01 00:18:20 -05:00 • committed by Andreas Kling
parent 3fb88cb76d
commit 08a1fb8f1a
4 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibGUI/GFilePicker.cpp
View file

@ -15,10 +15,10 @@
Optional<String> GFilePicker::get_open_filepath()
{
GFilePicker picker(Mode::Open);
auto picker = GFilePicker::construct(Mode::Open);
if (picker.exec() == GDialog::ExecOK) {
String file_path = picker.selected_file().string();
if (picker->exec() == GDialog::ExecOK) {
String file_path = picker->selected_file().string();
if (file_path.is_null())
return {};

3
Libraries/LibGUI/GFilePicker.h
View file

@ -20,7 +20,6 @@ public:
static Optional<String> get_save_filepath(const String& title, const String& extension);
static bool file_exists(const StringView& path);
GFilePicker(Mode type = Mode::Open, const StringView& file_name = "Untitled", const StringView& path = String(get_current_user_home_path()), CObject* parent = nullptr);
virtual ~GFilePicker() override;
FileSystemPath selected_file() const { return m_selected_file; }
@ -30,6 +29,8 @@ private:
void clear_preview();
void on_file_return();
GFilePicker(Mode type = Mode::Open, const StringView& file_name = "Untitled", const StringView& path = String(get_current_user_home_path()), CObject* parent = nullptr);
static String ok_button_name(Mode mode)
{
switch (mode) {