loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed false positive plugin highlighting in editor.

Browse Source 
This was an existing issue, unrelated to code refactoring, wherea plugin
selecting a plugin could bold the previous plugin's list entry even if
no changes were made. Also fixed incorrect priority values being
displayed on initialisation.
This commit is contained in:
WrinklyNinja
2014-06-23 12:58:43 +01:00
parent 4da34e343a
commit 101e12b8cf
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/editor.cpp
+8 -5
View File
@@ -985,6 +985,9 @@ void EditorPanel::OnDragStart(wxListEvent& event) {
void EditorPanel::AddPluginToList(const loot::Plugin& plugin, int position) {
loot::Plugin userEdits = GetUserData(FromUTF8(plugin.Name()));
loot::Plugin mergedPlugin(plugin);
mergedPlugin.MergeMetadata(userEdits);
if (!userEdits.HasNameOnly()) {
if (userEdits.Enabled())
pluginList->InsertItem(position, FromUTF8("\xE2\x9C\x93"));
@@ -994,13 +997,13 @@ void EditorPanel::AddPluginToList(const loot::Plugin& plugin, int position) {
else
pluginList->InsertItem(position, "");
pluginList->SetItem(position, 1, FromUTF8(plugin.Name()));
pluginList->SetItem(position, 2, FromUTF8(to_string(loot::modulo(plugin.Priority(), loot::max_priority))));
if (abs(plugin.Priority()) >= loot::max_priority)
pluginList->SetItem(position, 1, FromUTF8(mergedPlugin.Name()));
pluginList->SetItem(position, 2, FromUTF8(to_string(loot::modulo(mergedPlugin.Priority(), loot::max_priority))));
if (abs(mergedPlugin.Priority()) >= loot::max_priority)
pluginList->SetItem(position, 3, FromUTF8("\xE2\x9C\x93"));
else
pluginList->SetItem(position, 3, FromUTF8("\xE2\x9C\x97"));
if (plugin.LoadsBSA(_game)) {
if (mergedPlugin.LoadsBSA(_game)) {
pluginList->SetItemTextColour(position, wxColour(0, 142, 219));
}
}
@@ -1080,7 +1083,7 @@ void EditorPanel::ApplyEdits(const wxString& plugin) {
if (!diff.HasNameOnly()) {
if (pos != _editedPlugins.end()) {
if (!pos->DiffMetadata(edited).HasNameOnly())
if (!pos->DiffMetadata(diff).HasNameOnly())
pluginList->SetItemFont(i, wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold());
*pos = diff;
}