diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/devices/320x480/res/fonts/Roboto-Condensed-10.dat | bin | 1297 -> 0 bytes | |||
| -rw-r--r-- | gui/devices/320x480/res/fonts/Roboto-Condensed-12.dat | bin | 1527 -> 0 bytes | |||
| -rw-r--r-- | gui/devices/320x480/res/fonts/Roboto-Condensed-20.dat | bin | 3671 -> 0 bytes | |||
| -rw-r--r-- | gui/fileselector.cpp | 16 | ||||
| -rw-r--r-- | gui/objects.hpp | 1 |
5 files changed, 4 insertions, 13 deletions
diff --git a/gui/devices/320x480/res/fonts/Roboto-Condensed-10.dat b/gui/devices/320x480/res/fonts/Roboto-Condensed-10.dat Binary files differdeleted file mode 100644 index 02e869b78..000000000 --- a/gui/devices/320x480/res/fonts/Roboto-Condensed-10.dat +++ /dev/null diff --git a/gui/devices/320x480/res/fonts/Roboto-Condensed-12.dat b/gui/devices/320x480/res/fonts/Roboto-Condensed-12.dat Binary files differdeleted file mode 100644 index b48c4f213..000000000 --- a/gui/devices/320x480/res/fonts/Roboto-Condensed-12.dat +++ /dev/null diff --git a/gui/devices/320x480/res/fonts/Roboto-Condensed-20.dat b/gui/devices/320x480/res/fonts/Roboto-Condensed-20.dat Binary files differdeleted file mode 100644 index 531d5fdaf..000000000 --- a/gui/devices/320x480/res/fonts/Roboto-Condensed-20.dat +++ /dev/null diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp index 37eeed2ca..8b5804494 100644 --- a/gui/fileselector.cpp +++ b/gui/fileselector.cpp @@ -391,20 +391,14 @@ int GUIFileSelector::Render(void) } // Update the file list if needed - pthread_mutex_lock(&updateFileListmutex); if (updateFileList) { - pthread_mutex_unlock(&updateFileListmutex); string value; DataManager::GetValue(mPathVar, value); if (GetFileList(value) == 0) { - pthread_mutex_lock(&updateFileListmutex); updateFileList = false; - pthread_mutex_unlock(&updateFileListmutex); } else { return 0; } - } else { - pthread_mutex_unlock(&updateFileListmutex); } // This tells us how many lines we can actually render @@ -562,11 +556,9 @@ int GUIFileSelector::Render(void) } // If a change came in during the render then we need to do another redraw so leave mUpdate alone if updateFileList is true. - pthread_mutex_lock(&updateFileListmutex); if (!updateFileList) { mUpdate = 0; } - pthread_mutex_unlock(&updateFileListmutex); return 0; } @@ -846,6 +838,10 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y) int GUIFileSelector::NotifyVarChange(std::string varName, std::string value) { + if (varName.empty()) { + // Always clear the data variable so we know to use it + DataManager::SetValue(mVariable, ""); + } if (!mHeaderIsStatic) { std::string newValue = gui_parse_text(mHeaderText); if (mLastValue != newValue) { @@ -861,9 +857,7 @@ int GUIFileSelector::NotifyVarChange(std::string varName, std::string value) if (varName == mSortVariable) { DataManager::GetValue(mSortVariable, mSortOrder); } - pthread_mutex_lock(&updateFileListmutex); updateFileList = true; - pthread_mutex_unlock(&updateFileListmutex); mStart = 0; scrollingY = 0; scrollingSpeed = 0; @@ -1004,9 +998,7 @@ void GUIFileSelector::SetPageFocus(int inFocus) { if (inFocus) { - pthread_mutex_lock(&updateFileListmutex); updateFileList = true; - pthread_mutex_unlock(&updateFileListmutex); scrollingY = 0; scrollingSpeed = 0; mUpdate = 1; diff --git a/gui/objects.hpp b/gui/objects.hpp index 047b66b63..3a39fe565 100644 --- a/gui/objects.hpp +++ b/gui/objects.hpp @@ -496,7 +496,6 @@ protected: COLOR mFontHighlightColor; int startSelection; bool updateFileList; - pthread_mutex_t updateFileListmutex; }; class GUIListBox : public RenderObject, public ActionObject |