Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
0c2005f9
Commit
0c2005f9
authored
Mar 4, 2024
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
TwoPaneLayout: remove clipping logic
Change-Id: I04f5bfdf99429959944ed9449bbdceae8058b9e6
parent
0d6b2ee5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
jami-android/app/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java
+0
-43
0 additions, 43 deletions
...pp/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java
with
0 additions
and
43 deletions
jami-android/app/src/main/java/cx/ring/views/twopane/TwoPaneLayout.java
+
0
−
43
View file @
0c2005f9
...
@@ -211,21 +211,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable {
...
@@ -211,21 +211,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable {
sendAccessibilityEvent
(
AccessibilityEvent
.
TYPE_WINDOW_STATE_CHANGED
);
sendAccessibilityEvent
(
AccessibilityEvent
.
TYPE_WINDOW_STATE_CHANGED
);
}
}
void
updateObscuredViewsVisibility
(
View
panel
)
{
boolean
visibility
=
!
mCanSlide
||
!
isOpened
;
for
(
int
i
=
0
,
childCount
=
getChildCount
();
i
<
childCount
;
i
++)
{
final
View
child
=
getChildAt
(
i
);
if
(
child
==
panel
)
{
// There are still more children above the panel but they won't be affected.
break
;
}
else
if
(
child
.
getVisibility
()
==
GONE
)
{
continue
;
}
child
.
setVisibility
(
visibility
?
VISIBLE
:
INVISIBLE
);
}
}
@Override
@Override
protected
void
onAttachedToWindow
()
{
protected
void
onAttachedToWindow
()
{
super
.
onAttachedToWindow
();
super
.
onAttachedToWindow
();
...
@@ -515,10 +500,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable {
...
@@ -515,10 +500,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable {
nextXStart
+=
child
.
getWidth
()
+
Math
.
abs
(
nextXOffset
);
nextXStart
+=
child
.
getWidth
()
+
Math
.
abs
(
nextXOffset
);
}
}
if
(
mFirstLayout
)
{
updateObscuredViewsVisibility
(
mSlideableView
);
}
mFirstLayout
=
false
;
mFirstLayout
=
false
;
}
}
...
@@ -616,30 +597,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable {
...
@@ -616,30 +597,6 @@ public class TwoPaneLayout extends ViewGroup implements Openable {
return
mCanSlide
;
return
mCanSlide
;
}
}
@Override
protected
boolean
drawChild
(
Canvas
canvas
,
View
child
,
long
drawingTime
)
{
final
LayoutParams
lp
=
(
LayoutParams
)
child
.
getLayoutParams
();
boolean
result
;
final
int
save
=
canvas
.
save
();
if
(
mCanSlide
&&
!
lp
.
slideable
&&
mSlideableView
!=
null
)
{
// Clip against the slider; no sense drawing what will immediately be covered.
canvas
.
getClipBounds
(
mTmpRect
);
if
(
isLayoutRtlSupport
())
{
mTmpRect
.
left
=
Math
.
max
(
mTmpRect
.
left
,
mSlideableView
.
getRight
());
}
else
{
mTmpRect
.
right
=
Math
.
min
(
mTmpRect
.
right
,
mSlideableView
.
getLeft
());
}
canvas
.
clipRect
(
mTmpRect
);
}
result
=
super
.
drawChild
(
canvas
,
child
,
drawingTime
);
canvas
.
restoreToCount
(
save
);
return
result
;
}
/**
/**
* @param opened position to switch to
* @param opened position to switch to
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment