Skip to content

Commit f788b9c

Browse files
pocmocsadilek
authored andcommitted
Closes mozilla-mobile#395: BrowserToolbar: Layout children relative to BrowserToolbar.
1 parent 1a5c663 commit f788b9c

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/BrowserToolbar.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ class BrowserToolbar @JvmOverloads constructor(
149149
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
150150
forEach { child ->
151151
child.layout(
152-
left + paddingLeft,
153-
top + paddingTop,
154-
right - paddingRight,
155-
bottom - paddingBottom)
152+
0 + paddingLeft,
153+
0 + paddingTop,
154+
child.measuredWidth - paddingRight,
155+
child.measuredHeight - paddingBottom)
156156
}
157157
}
158158

components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/BrowserToolbarTest.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.junit.Assert.assertTrue
1616
import org.junit.Test
1717
import org.junit.runner.RunWith
1818
import org.mockito.ArgumentMatchers
19+
import org.mockito.Mockito.`when`
1920
import org.mockito.Mockito.mock
2021
import org.mockito.Mockito.never
2122
import org.mockito.Mockito.verify
@@ -217,19 +218,24 @@ class BrowserToolbarTest {
217218
fun `display and edit toolbar will be laid out at the exact same position`() {
218219
val toolbar = BrowserToolbar(RuntimeEnvironment.application)
219220
val displayToolbar = mock(DisplayToolbar::class.java)
220-
val ediToolbar = mock(EditToolbar::class.java)
221+
val editToolbar = mock(EditToolbar::class.java)
221222

222223
toolbar.displayToolbar = displayToolbar
223-
toolbar.editToolbar = ediToolbar
224+
toolbar.editToolbar = editToolbar
224225

225226
toolbar.removeAllViews()
226227
toolbar.addView(toolbar.displayToolbar)
227228
toolbar.addView(toolbar.editToolbar)
228229

230+
`when`(displayToolbar.measuredWidth).thenReturn(1000)
231+
`when`(displayToolbar.measuredHeight).thenReturn(200)
232+
`when`(editToolbar.measuredWidth).thenReturn(1000)
233+
`when`(editToolbar.measuredHeight).thenReturn(200)
234+
229235
toolbar.layout(100, 100, 1100, 300)
230236

231-
verify(displayToolbar).layout(100, 100, 1100, 300)
232-
verify(ediToolbar).layout(100, 100, 1100, 300)
237+
verify(displayToolbar).layout(0, 0, 1000, 200)
238+
verify(editToolbar).layout(0, 0, 1000, 200)
233239
}
234240

235241
@Test

0 commit comments

Comments
 (0)