RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code 

Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
gtk4
Viktar Lukashonak 2024-01-08 22:48:57 +03:00
parent 158767b5b4
commit f8eb01def2
No known key found for this signature in database
GPG Key ID: 08A413AA87200A6F
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/bar.hpp
View File

@ -1,18 +1,13 @@
#pragma once #pragma once
#include <gdkmm/monitor.h> #include <gdkmm/monitor.h>
#include <glibmm/refptr.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/centerbox.h> #include <gtkmm/centerbox.h>
#include <gtkmm/cssprovider.h> #include <gtkmm/cssprovider.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include <json/json.h>
#include <memory>
#include <vector>
#include "AModule.hpp" #include "AModule.hpp"
#include "group.hpp" //#include "group.hpp"
#include "xdg-output-unstable-v1-client-protocol.h" #include "xdg-output-unstable-v1-client-protocol.h"
namespace waybar { namespace waybar {

4
include/client.hpp
View File

@ -1,9 +1,6 @@
#pragma once #pragma once
#include <fmt/format.h>
#include <gdk/gdk.h>
#include <gdk/wayland/gdkwayland.h> #include <gdk/wayland/gdkwayland.h>
#include <wayland-client.h>
#include "bar.hpp" #include "bar.hpp"
#include "config.hpp" #include "config.hpp"
@ -52,7 +49,6 @@ class Client {
void handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor); void handleMonitorRemoved(Glib::RefPtr<Gdk::Monitor> monitor);
void handleDeferredMonitorRemoval(Glib::RefPtr<Gdk::Monitor> monitor); void handleDeferredMonitorRemoval(Glib::RefPtr<Gdk::Monitor> monitor);
// Glib::RefPtr<Gtk::StyleContext> style_context_;
Glib::RefPtr<Gtk::CssProvider> css_provider_; Glib::RefPtr<Gtk::CssProvider> css_provider_;
std::unique_ptr<Portal> portal; std::unique_ptr<Portal> portal;
std::list<struct waybar_output> outputs_; std::list<struct waybar_output> outputs_;

2
meson.build
View File

@ -84,7 +84,6 @@ wayland_cursor = dependency('wayland-cursor')
wayland_protos = dependency('wayland-protocols') wayland_protos = dependency('wayland-protocols')
sigcpp = dependency('sigc++-3.0', version: ['>=3.4.0']) sigcpp = dependency('sigc++-3.0', version: ['>=3.4.0'])
gtkmm = dependency('gtkmm-4.0', version : ['>=4.12.0']) gtkmm = dependency('gtkmm-4.0', version : ['>=4.12.0'])
gtk = dependency('gtk4', version : ['>=4.10.5'])
giounix = dependency('gio-unix-2.0', version: ['>=2.76.4']) giounix = dependency('gio-unix-2.0', version: ['>=2.76.4'])
spdlog = dependency('spdlog', version : ['>=1.10.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=enabled']) spdlog = dependency('spdlog', version : ['>=1.10.0'], fallback : ['spdlog', 'spdlog_dep'], default_options : ['external_fmt=enabled'])
@ -122,7 +121,6 @@ executable(
'waybar', 'waybar',
[src_files], [src_files],
dependencies: [ dependencies: [
gtk,
gtk_layer_shell, gtk_layer_shell,
gtkmm, gtkmm,
giounix, giounix,

4
src/bar.cpp
View File

@ -4,12 +4,10 @@
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <type_traits>
#include "bar.hpp" #include "bar.hpp"
#include "client.hpp" #include "client.hpp"
//#include "factory.hpp" //#include "factory.hpp"
#include "group.hpp" //#include "group.hpp"
#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h"
#ifdef HAVE_SWAY #ifdef HAVE_SWAY