FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix portable settings.path not respected for prefs and language by avinxshKD · Pull Request #1439 · processing/processing4 · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .kt  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion app/src/processing/app/Preferences.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fun PreferencesProvider(content: @Composable () -> Unit) {
val preferencesFileOverride: File? = System.getProperty("processing.app.preferences.file")?.let { File(it) }
val preferencesDebounceOverride: Long? = System.getProperty("processing.app.preferences.debounce")?.toLongOrNull()

val settingsFolder = Settings.getFolder()
val settingsFolder = Base.getSettingsOverride() ?: Settings.getFolder()
val preferencesFile = preferencesFileOverride ?: settingsFolder.resolve(PREFERENCES_FILE_NAME)

if (!preferencesFile.exists()) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/processing/app/ui/theme/Locale.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package processing.app.ui.theme
import androidx.compose.runtime.*
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.LayoutDirection
import processing.app.Base
import processing.app.Messages
import processing.app.watchFile
import processing.utils.Settings
Expand Down Expand Up @@ -90,7 +91,7 @@ var LastLocaleUpdate by mutableStateOf(0L)
*/
@Composable
fun LocaleProvider(content: @Composable () -> Unit) {
val settingsFolder = Settings.getFolder()
val settingsFolder = Base.getSettingsOverride() ?: Settings.getFolder()
val languageFile = File(settingsFolder, "language.txt")
watchFile(languageFile)

Expand Down

Back | FazBrowse Home | New Git URL