dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2720:9ce1649b0fbd

Android: Fix vertical sliders/scrollbars by creating a DWSlider class to encapsulate the SeekBar... then override the measurements and adjust the width. The width on the SeekBar needs to be set to the height after rotation... Since that is not the actually correct width, we need to wrap it in a frame.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 09 Dec 2021 01:57:52 +0000
parents	6754e8f70142
children	cacde852e2db

comparison

equal deleted inserted replaced

-:6754e8f70142
+:9ce1649b0fbd
 import android.content.Intent
 import android.util.*
 import android.util.Base64
 import kotlin.math.*
 import android.content.ContentUris
+import androidx.appcompat.widget.AppCompatSeekBar
 // Color Wheel section
 private val HUE_COLORS = intArrayOf(
 Color.RED,
 }
 external fun eventHandlerHTMLChanged(obj1: View, message: Int, URI: String, status: Int)
 }
+class DWSlider
+@JvmOverloads constructor(context: Context): FrameLayout(context) {
+val slider: SeekBar = SeekBar(context)
+init {
+slider.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT,
+LayoutParams.WRAP_CONTENT, Gravity.CENTER)
+addView(slider)
+}
+@Synchronized
+override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+if(slider.rotation == 90F || slider.rotation == 270F) {
+val layoutHeight = MeasureSpec.getSize(heightMeasureSpec)
+// set slider width to layout heigth
+slider.layoutParams.width = layoutHeight
+}
+super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+if(slider.rotation == 90F || slider.rotation == 270F) {
+// update layout width to the rotated height of the slider
+// otherwise the layout remains quadratic
+setMeasuredDimension(slider.measuredHeight, measuredHeight)
+}
+}
+}
 class DWSpinButton(context: Context) : AppCompatEditText(context), OnTouchListener {
 var value: Long = 0
 var minimum: Long = 0
 var maximum: Long = 65535
 constraintSet.applyTo(splitbar)
 }
 }
 }
-fun scrollBarNew(vertical: Int, cid: Int): SeekBar?
+fun scrollBarNew(vertical: Int, cid: Int): DWSlider?
 {
-var slider: SeekBar? = null
+var scrollbar: DWSlider? = null
 waitOnUiThread {
 val dataArrayMap = SimpleArrayMap<String, Long>()
-slider = SeekBar(this)
+scrollbar = DWSlider(this)
+scrollbar!!.tag = dataArrayMap
+scrollbar!!.id = cid
+scrollbar!!.slider.max = 1
+scrollbar!!.slider.progressTintList = null
+scrollbar!!.slider.progressBackgroundTintList = null
+if (vertical != 0) {
+scrollbar!!.slider.rotation = 90F
+}
+scrollbar!!.slider.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
+override fun onStopTrackingTouch(seekBar: SeekBar) {
+}
+override fun onStartTrackingTouch(seekBar: SeekBar) {
+}
+override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+eventHandlerInt(scrollbar as View, DWEvent.VALUE_CHANGED, scrollbar!!.slider.progress, 0, 0, 0)
+}
+})
+}
+return scrollbar
+}
+fun sliderNew(vertical: Int, increments: Int, cid: Int): DWSlider?
+{
+var slider: DWSlider? = null
+waitOnUiThread {
+val dataArrayMap = SimpleArrayMap<String, Long>()
+slider = DWSlider(this)
 slider!!.tag = dataArrayMap
 slider!!.id = cid
-slider!!.max = 1
+slider!!.slider.max = increments
-slider!!.progressTintList = null
-slider!!.progressBackgroundTintList = null
 if (vertical != 0) {
-slider!!.rotation = 90F
+slider!!.slider.rotation = 90F
 }
-slider!!.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
+slider!!.slider.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
 override fun onStopTrackingTouch(seekBar: SeekBar) {
 }
 override fun onStartTrackingTouch(seekBar: SeekBar) {
 }
 override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-eventHandlerInt(slider as View, DWEvent.VALUE_CHANGED, slider!!.progress, 0, 0, 0)
+eventHandlerInt(slider as View, DWEvent.VALUE_CHANGED, slider!!.slider.progress, 0, 0, 0)
-}
-})
-}
-return slider
-}
-fun sliderNew(vertical: Int, increments: Int, cid: Int): SeekBar?
-{
-var slider: SeekBar? = null
-waitOnUiThread {
-val dataArrayMap = SimpleArrayMap<String, Long>()
-slider = SeekBar(this)
-slider!!.tag = dataArrayMap
-slider!!.id = cid
-slider!!.max = increments
-if (vertical != 0) {
-slider!!.rotation = 90F
-}
-slider!!.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
-override fun onStopTrackingTouch(seekBar: SeekBar) {
-}
-override fun onStartTrackingTouch(seekBar: SeekBar) {
-}
-override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-eventHandlerInt(slider as View, DWEvent.VALUE_CHANGED, slider!!.progress, 0, 0, 0)
 }
 })
 }
 return slider
 }
 percent!!.max = 100
 }
 return percent
 }
-fun percentGetPos(percent: ProgressBar): Int
+fun percentGetPos(percent: View): Int
 {
 var retval = 0
 waitOnUiThread {
-retval = percent.progress
+var progress: ProgressBar
+if(percent is ProgressBar) {
+progress = percent as ProgressBar
+} else {
+val slider = percent as DWSlider
+progress = slider.slider
+}
+retval = progress.progress
 }
 return retval
 }
-fun percentSetPos(percent: ProgressBar, position: Int)
+fun percentSetPos(percent: View, position: Int)
 {
 waitOnUiThread {
-percent.progress = position
+var progress: ProgressBar
-}
-}
+if(percent is ProgressBar) {
+progress = percent as ProgressBar
-fun percentSetRange(percent: ProgressBar, range: Int)
+} else {
-{
+val slider = percent as DWSlider
-waitOnUiThread {
+progress = slider.slider
-percent.max = range
+}
+progress.progress = position
+}
+}
+fun percentSetRange(percent: View, range: Int)
+{
+waitOnUiThread {
+var progress: ProgressBar
+if(percent is ProgressBar) {
+progress = percent as ProgressBar
+} else {
+val slider = percent as DWSlider
+progress = slider.slider
+}
+progress.max = range
 }
 }
 fun htmlNew(cid: Int): WebView?
 {

Mercurial > dwindows

comparison android/DWindows.kt @ 2720:9ce1649b0fbd