Changeset View
Changeset View
Standalone View
Standalone View
libtaskmanager/tasksmodel.cpp
| Show First 20 Lines • Show All 891 Lines • ▼ Show 20 Line(s) | 883 | case SortVirtualDesktop: { | |||
|---|---|---|---|---|---|
| 892 | 892 | | |||
| 893 | const QVariantList &leftDesktops = left.data(AbstractTasksModel::VirtualDesktops).toList(); | 893 | const QVariantList &leftDesktops = left.data(AbstractTasksModel::VirtualDesktops).toList(); | ||
| 894 | QVariant leftDesktop; | 894 | QVariant leftDesktop; | ||
| 895 | int leftDesktopPos = virtualDesktopInfo->numberOfDesktops(); | 895 | int leftDesktopPos = virtualDesktopInfo->numberOfDesktops(); | ||
| 896 | 896 | | |||
| 897 | for (const QVariant &desktop : leftDesktops) { | 897 | for (const QVariant &desktop : leftDesktops) { | ||
| 898 | const int desktopPos = virtualDesktopInfo->position(desktop); | 898 | const int desktopPos = virtualDesktopInfo->position(desktop); | ||
| 899 | 899 | | |||
| 900 | if (desktopPos < leftDesktopPos) { | 900 | if (desktopPos <= leftDesktopPos) { | ||
| 901 | leftDesktop = desktop; | 901 | leftDesktop = desktop; | ||
| 902 | leftDesktopPos = desktopPos; | 902 | leftDesktopPos = desktopPos; | ||
| 903 | } | 903 | } | ||
| 904 | } | 904 | } | ||
| 905 | 905 | | |||
| 906 | const QVariantList &rightDesktops = right.data(AbstractTasksModel::VirtualDesktops).toList(); | 906 | const QVariantList &rightDesktops = right.data(AbstractTasksModel::VirtualDesktops).toList(); | ||
| 907 | QVariant rightDesktop; | 907 | QVariant rightDesktop; | ||
| 908 | int rightDesktopPos = virtualDesktopInfo->numberOfDesktops(); | 908 | int rightDesktopPos = virtualDesktopInfo->numberOfDesktops(); | ||
| 909 | 909 | | |||
| 910 | for (const QVariant &desktop : rightDesktops) { | 910 | for (const QVariant &desktop : rightDesktops) { | ||
| 911 | const int desktopPos = virtualDesktopInfo->position(desktop); | 911 | const int desktopPos = virtualDesktopInfo->position(desktop); | ||
| 912 | 912 | | |||
| 913 | if (desktopPos < rightDesktopPos) { | 913 | if (desktopPos <= rightDesktopPos) { | ||
| 914 | rightDesktop = desktop; | 914 | rightDesktop = desktop; | ||
| 915 | rightDesktopPos = desktopPos; | 915 | rightDesktopPos = desktopPos; | ||
| 916 | } | 916 | } | ||
| 917 | } | 917 | } | ||
| 918 | 918 | | |||
| 919 | if (!leftDesktop.isNull() && !rightDesktop.isNull() && (leftDesktop != rightDesktop)) { | 919 | if (!leftDesktop.isNull() && !rightDesktop.isNull() && (leftDesktop != rightDesktop)) { | ||
| 920 | return (virtualDesktopInfo->position(leftDesktop) < virtualDesktopInfo->position(rightDesktop)); | 920 | return (virtualDesktopInfo->position(leftDesktop) < virtualDesktopInfo->position(rightDesktop)); | ||
| 921 | } else if (!leftDesktop.isNull() && rightDesktop.isNull()) { | 921 | } else if (!leftDesktop.isNull() && rightDesktop.isNull()) { | ||
| 922 | return false; | 922 | return false; | ||
| 923 | } else if (leftDesktop.isNull() && !rightDesktop.isNull()) { | 923 | } else if (leftDesktop.isNull() && !rightDesktop.isNull()) { | ||
| 924 | return true; | 924 | return true; | ||
| 925 | } | 925 | } | ||
| 926 | | ||||
| 927 | return false; | | |||
| 928 | } | 926 | } | ||
| 929 | case SortActivity: { | 927 | case SortActivity: { | ||
| 930 | // updateActivityTaskCounts() counts the number of window tasks on each | 928 | // updateActivityTaskCounts() counts the number of window tasks on each | ||
| 931 | // activity. This will sort tasks by comparing a cumulative score made | 929 | // activity. This will sort tasks by comparing a cumulative score made | ||
| 932 | // up of the task counts for each acvtivity a task is assigned to, and | 930 | // up of the task counts for each acvtivity a task is assigned to, and | ||
| 933 | // otherwise fall through to alphabetical sorting. | 931 | // otherwise fall through to alphabetical sorting. | ||
| 934 | int leftScore = -1; | 932 | int leftScore = -1; | ||
| 935 | int rightScore = -1; | 933 | int rightScore = -1; | ||
| ▲ Show 20 Lines • Show All 1003 Lines • Show Last 20 Lines | |||||