expvintl/NeoTerm_System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve: distinguish inflate mode and preview mode

Browse Source
This commit is contained in:
zt515 2017-12-11 23:58:05 +08:00
parent 306f67df40
commit 09471df673
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/io/neoterm/ui/term/tab/NeoTabDecorator.kt
View File

@ -31,8 +31,6 @@ class NeoTabDecorator(val context: NeoTermActivity) : TabSwitcherDecorator() {
private val VIEW_TYPE_X = 2 private val VIEW_TYPE_X = 2
} }
private var itemCaches = mutableMapOf<Int, Int>()
private fun setViewLayerType(view: View?) = view?.setLayerType(View.LAYER_TYPE_NONE, null) private fun setViewLayerType(view: View?) = view?.setLayerType(View.LAYER_TYPE_NONE, null)
override fun onInflateView(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): View { override fun onInflateView(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): View {
@ -58,22 +56,20 @@ class NeoTabDecorator(val context: NeoTermActivity) : TabSwitcherDecorator() {
val toolbar = this@NeoTabDecorator.context.toolbar val toolbar = this@NeoTabDecorator.context.toolbar
toolbar.title = if (tabSwitcher.isSwitcherShown) null else tab.title toolbar.title = if (tabSwitcher.isSwitcherShown) null else tab.title
// if (itemCaches[index] != tab.hashCode()) { val isQuickPreview = tabSwitcher.selectedTabIndex != index
// itemCaches[index] = tab.hashCode()
// NLog.e("TabDecorator", "onShowTab() called, rebinging views for new selected tab.")
// } else {
// NLog.e("TabDecorator", "onShowTab() called, tab not changed.")
// return
// }
when (viewType) { when (viewType) {
VIEW_TYPE_TERM -> { VIEW_TYPE_TERM -> {
val termTab = tab as TermTab val termTab = tab as TermTab
termTab.toolbar = toolbar termTab.toolbar = toolbar
val terminalView = findViewById<TerminalView>(R.id.terminal_view) val terminalView = findViewById<TerminalView>(R.id.terminal_view)
val extraKeysView = findViewById<ExtraKeysView>(R.id.extra_keys) if (isQuickPreview) {
bindTerminalView(termTab, terminalView, extraKeysView) bindTerminalView(termTab, terminalView, null, isQuickPreview)
terminalView.requestFocus() } else {
val extraKeysView = findViewById<ExtraKeysView>(R.id.extra_keys)
bindTerminalView(termTab, terminalView, extraKeysView, isQuickPreview)
terminalView.requestFocus()
}
} }
VIEW_TYPE_X -> { VIEW_TYPE_X -> {
@ -136,8 +132,14 @@ class NeoTabDecorator(val context: NeoTermActivity) : TabSwitcherDecorator() {
} }
} }
private fun bindTerminalView(tab: TermTab, view: TerminalView?, extraKeysView: ExtraKeysView?) { private fun bindTerminalView(tab: TermTab, view: TerminalView?,
if (view == null) { extraKeysView: ExtraKeysView?, isQuickPreview: Boolean) {
val termView = view ?: return
val termData = tab.termData
if (isQuickPreview) {
TerminalUtils.setupTerminalView(termView)
termView.attachSession(termData.termSession)
return return
} }
@ -147,19 +149,16 @@ class NeoTabDecorator(val context: NeoTermActivity) : TabSwitcherDecorator() {
val colorSchemeManager = ComponentManager.getComponent<ColorSchemeComponent>() val colorSchemeManager = ComponentManager.getComponent<ColorSchemeComponent>()
colorSchemeManager.applyColorScheme(view, extraKeysView, colorSchemeManager.getCurrentColorScheme()) colorSchemeManager.applyColorScheme(view, extraKeysView, colorSchemeManager.getCurrentColorScheme())
val termData = tab.termData
TerminalUtils.setupTerminalSession(termData.termSession) TerminalUtils.setupTerminalSession(termData.termSession)
// 复用前一次的 TermSessionCallback 和 TermViewClient // 复用前一次的 TermSessionCallback 和 TermViewClient
termData.initializeViewWith(tab, view, extraKeysView) termData.initializeViewWith(tab, termView, extraKeysView)
if (termData.termSession != null) { if (termData.termSession != null) {
termData.viewClient?.updateExtraKeys(termData.termSession?.title, true) termData.viewClient?.updateExtraKeys(termData.termSession?.title, true)
} }
view.setTerminalViewClient(termData.viewClient) termView.attachSession(termData.termSession)
view.attachSession(termData.termSession)
} }
override fun getViewTypeCount(): Int { override fun getViewTypeCount(): Int {