RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 09:28:13 +00:00
Code Issues Activity Actions

LibGUI: Reduce menu-related header dependencies

Browse source
This commit is contained in:
Andreas Kling 2020-02-15 01:56:30 +01:00
parent 9e83bbe1cd
commit b011ea9962
16 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Libraries/LibGUI/Menu.cpp
View file

@ -29,6 +29,7 @@
#include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuItem.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibGfx/Bitmap.h>

2
Libraries/LibGUI/Menu.h
View file

@ -30,12 +30,12 @@
#include <AK/NonnullOwnPtrVector.h>
#include <AK/NonnullRefPtr.h>
#include <LibCore/Object.h>
#include <LibGUI/MenuItem.h>
#include <LibGfx/Forward.h>
namespace GUI {
class Action;
class MenuItem;
class Menu final : public Core::Object {
C_OBJECT(Menu)

3
Libraries/LibGUI/MenuBar.cpp
View file

@ -24,7 +24,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/Badge.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/MenuItem.h>
#include <LibGUI/WindowServerConnection.h>
namespace GUI {

6
Libraries/LibGUI/MenuBar.h
View file

@ -26,13 +26,13 @@
#pragma once
#include <AK/Badge.h>
#include <AK/NonnullOwnPtrVector.h>
#include <LibGUI/Menu.h>
#include <AK/Forward.h>
#include <AK/NonnullRefPtrVector.h>
namespace GUI {
class Application;
class Menu;
class MenuBar {
public:

10
Libraries/LibGUI/MenuItem.cpp
View file

@ -88,4 +88,14 @@ void MenuItem::update_window_server()
WindowServerConnection::the().send_sync<Messages::WindowServer::UpdateMenuItem>(m_menu_id, m_identifier, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, shortcut_text);
}
void MenuItem::set_menu_id(Badge<Menu>, unsigned int menu_id)
{
m_menu_id = menu_id;
}
void MenuItem::set_identifier(Badge<Menu>, unsigned identifier)
{
m_identifier = identifier;
}
}

10
Libraries/LibGUI/MenuItem.h
View file

@ -26,10 +26,8 @@
#pragma once
#include <AK/Badge.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/OwnPtr.h>
#include <AK/String.h>
#include <AK/Forward.h>
#include <AK/RefPtr.h>
namespace GUI {
@ -68,8 +66,8 @@ public:
bool is_enabled() const { return m_enabled; }
void set_enabled(bool);
void set_menu_id(Badge<Menu>, unsigned menu_id) { m_menu_id = menu_id; }
void set_identifier(Badge<Menu>, unsigned identifier) { m_identifier = identifier; }
void set_menu_id(Badge<Menu>, unsigned menu_id);
void set_identifier(Badge<Menu>, unsigned identifier);
private:
void update_window_server();