flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-16 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: auto wrap mode (#215)

Browse Source
This commit is contained in:
hstyi
2025-02-13 15:50:50 +08:00
committed by GitHub
parent d0d51b3e6f
commit 8d6295fd3b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/app/termora/terminal/CursorStore.kt
View File

@@ -13,9 +13,11 @@ data class CursorStore(
*/ */
val textStyle: TextStyle, val textStyle: TextStyle,
/** /**
* 如果为 null 表示没有设置
*
* @see [DataKey.AutoWrapMode] * @see [DataKey.AutoWrapMode]
*/ */
val autoWarpMode: Boolean, val autoWarpMode: Boolean?,
/** /**
* @see [DataKey.OriginMode] * @see [DataKey.OriginMode]
*/ */

6
src/main/kotlin/app/termora/terminal/CursorStoreStores.kt
View File

@@ -22,7 +22,9 @@ object CursorStoreStores {
terminalModel.setData(DataKey.OriginMode, cursorStore.originMode) terminalModel.setData(DataKey.OriginMode, cursorStore.originMode)
terminalModel.setData(DataKey.TextStyle, cursorStore.textStyle) terminalModel.setData(DataKey.TextStyle, cursorStore.textStyle)
terminalModel.setData(DataKey.AutoWrapMode, cursorStore.autoWarpMode) if (cursorStore.autoWarpMode != null) {
terminalModel.setData(DataKey.AutoWrapMode, cursorStore.autoWarpMode)
}
terminalModel.setData(DataKey.GraphicCharacterSet, cursorStore.graphicCharacterSet) terminalModel.setData(DataKey.GraphicCharacterSet, cursorStore.graphicCharacterSet)
val region = if (terminalModel.isOriginMode()) terminalModel.getScrollingRegion() val region = if (terminalModel.isOriginMode()) terminalModel.getScrollingRegion()
@@ -52,7 +54,7 @@ object CursorStoreStores {
val cursorStore = CursorStore( val cursorStore = CursorStore(
position = terminal.getCursorModel().getPosition(), position = terminal.getCursorModel().getPosition(),
textStyle = terminalModel.getData(DataKey.TextStyle), textStyle = terminalModel.getData(DataKey.TextStyle),
autoWarpMode = terminalModel.getData(DataKey.AutoWrapMode, false), autoWarpMode = if (terminalModel.hasData(DataKey.AutoWrapMode)) terminalModel.getData(DataKey.AutoWrapMode) else null,
originMode = terminalModel.isOriginMode(), originMode = terminalModel.isOriginMode(),
graphicCharacterSet = graphicCharacterSet.copy(characterSets = characterSets), graphicCharacterSet = graphicCharacterSet.copy(characterSets = characterSets),
) )