beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 17:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

SystemMonitor: Return icon display data as GUI::Icons

Browse source 
And delete the generic icon member which has been dormant since
switching to FileIconProvider. Fixes icon column not being properly
painted as icon cells.
This commit is contained in:
thankyouverycool 2021-03-03 23:50:06 -05:00 committed by Andreas Kling
parent af581cbd91
commit 2e5d5eb3d8
Notes: sideshowbarker 2024-07-18 21:42:57 +09:00 
Author: https://github.com/thankyouverycool
Commit: https://github.com/SerenityOS/serenity/commit/2e5d5eb3d8b
Pull-request: https://github.com/SerenityOS/serenity/pull/5636
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Userland/Applications/SystemMonitor/ProcessModel.cpp
View file

@ -43,7 +43,6 @@ ProcessModel::ProcessModel()
{
VERIFY(!s_the);
s_the = this;
m_generic_process_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png");
auto file = Core::File::construct("/proc/cpuinfo");
if (file->open(Core::IODevice::ReadOnly)) {
@ -262,10 +261,10 @@ GUI::Variant ProcessModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
if (role == GUI::ModelRole::Display) {
switch (index.column()) {
case Column::Icon: {
auto icon = GUI::FileIconProvider::icon_for_executable(thread.current_state.executable);
if (auto* bitmap = icon.bitmap_for_size(16))
return *bitmap;
return *m_generic_process_icon;
auto icon = GUI::FileIconProvider::icon_for_executable(thread.current_state.executable).bitmap_for_size(16);
if (!icon)
return GUI::Icon();
return GUI::Icon(*icon);
}
case Column::PID:
return thread.current_state.pid;

1
Userland/Applications/SystemMonitor/ProcessModel.h
View file

@ -144,6 +144,5 @@ private:
HashMap<int, NonnullOwnPtr<Thread>> m_threads;
NonnullOwnPtrVector<CpuInfo> m_cpus;
Vector<int> m_tids;
RefPtr<Gfx::Bitmap> m_generic_process_icon;
RefPtr<Core::File> m_proc_all;
};