i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switcher: fix build

Browse Source 
Change-Id: I69b3643b89374d4aa4e6d8fe9cee105374bb8640
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6009
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Pascal Abresch
2024-08-16 14:28:14 +00:00
committed by nephele nephele
parent 174a9dbf80
commit 41d2224b7e
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/switcher/ApplicationsView.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ ApplicationsView::AttachedToWindow()
for (int32 i = 0; i < teamList.CountItems(); i++) { for (int32 i = 0; i < teamList.CountItems(); i++) {
app_info appInfo; app_info appInfo;
team_id team = (team_id)teamList.ItemAt(i); team_id team = (uintptr_t)teamList.ItemAt(i);
if (be_roster->GetRunningAppInfo(team, &appInfo) == B_OK) if (be_roster->GetRunningAppInfo(team, &appInfo) == B_OK)
_AddTeam(appInfo); _AddTeam(appInfo);
} }
src/apps/switcher/GroupListView.cpp
+6 -6
View File
@@ -105,19 +105,19 @@ GroupListView::SetModel(GroupListModel* model)
groupItem->SetVisible(false); groupItem->SetVisible(false);
AddChild(groupItem); AddChild(groupItem);
void* group = model->GroupAt(groupIndex); addr_t group = model->GroupAt(groupIndex);
groupMap[(addr_t)group] = groupItem; groupMap[group] = groupItem;
groupItem->AddItem(new RendererLayoutItem(this, groupIndex, group, groupItem->AddItem(new RendererLayoutItem(this, groupIndex, (void*)group,
fGroupRenderer)); fGroupRenderer));
} }
int32 itemCount = model->CountItems(); int32 itemCount = model->CountItems();
for (int itemIndex = 0; itemIndex < itemCount; itemIndex++) { for (int itemIndex = 0; itemIndex < itemCount; itemIndex++) {
void* group = model->GroupForItemAt(itemIndex); addr_t group = model->GroupForItemAt(itemIndex);
if (group == NULL) if (group == 0)
continue; continue;
BGroupLayout* groupItem = groupMap[(addr_t)group]; BGroupLayout* groupItem = groupMap[group];
if (groupItem == NULL) if (groupItem == NULL)
continue; continue;
src/apps/switcher/GroupListView.h
+4 -2
View File
@@ -12,17 +12,19 @@
class GroupListModel { class GroupListModel {
public: public:
virtual ~GroupListModel() {};
virtual int32 CountItems() = 0; virtual int32 CountItems() = 0;
virtual void* ItemAt(int32 index) = 0; virtual void* ItemAt(int32 index) = 0;
virtual int32 CountGroups() = 0; virtual int32 CountGroups() = 0;
virtual void* GroupAt(int32 index) = 0; virtual addr_t GroupAt(int32 index) = 0;
virtual void* GroupForItemAt(int32 index) = 0; virtual addr_t GroupForItemAt(int32 index) = 0;
}; };
class ListItemRenderer { class ListItemRenderer {
public: public:
virtual ~ListItemRenderer() {};
virtual void SetTo(BView* owner, void* item) = 0; virtual void SetTo(BView* owner, void* item) = 0;
virtual BSize MinSize() = 0; virtual BSize MinSize() = 0;
src/apps/switcher/WindowsView.cpp
+6 -6
View File
@@ -96,15 +96,15 @@ public:
return fWorkspaceCount; return fWorkspaceCount;
} }
virtual void* GroupAt(int32 index) virtual addr_t GroupAt(int32 index)
{ {
return (void*)(_NthSetBit(index, fWorkspaces) + 1); return _NthSetBit(index, fWorkspaces) + 1;
} }
virtual void* GroupForItemAt(int32 index) virtual addr_t GroupForItemAt(int32 index)
{ {
client_window_info* info = fWindows.ItemAt(index); client_window_info* info = fWindows.ItemAt(index);
return (void*)(_NthSetBit(0, info->workspaces) + 1); return _NthSetBit(0, info->workspaces) + 1;
} }
private: private:
@@ -116,7 +116,7 @@ private:
&& (info->show_hide_level <= 0 || info->is_mini); && (info->show_hide_level <= 0 || info->is_mini);
} }
int32 _NthSetBit(int32 index, uint32 mask) uint32 _NthSetBit(int32 index, uint32 mask)
{ {
for (uint32 i = 0; i < 32; i++) { for (uint32 i = 0; i < 32; i++) {
if ((mask & (1UL << i)) != 0) { if ((mask & (1UL << i)) != 0) {
@@ -221,7 +221,7 @@ class WorkspaceRenderer : public StringItemRenderer {
public: public:
virtual void SetTo(BView* owner, void* item) virtual void SetTo(BView* owner, void* item)
{ {
fWorkspace = (uint32)item; fWorkspace = (uintptr_t)item;
if ((uint32)current_workspace() == fWorkspace - 1) if ((uint32)current_workspace() == fWorkspace - 1)
SetText(owner, "Current workspace"); SetText(owner, "Current workspace");