Commit ce9878bb authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Commit Bot

Android: Fix wrong cs height upon rotation

The view height was not being set correctly when the device
was rotated as reported in the bug. The bar height should
have been taken into account like it was done at creation.
This CL fixes that. This matters only for full-sized width
contextual search panel only, where the cs panel is preserved
upon rotation.

Bug: 819506
Change-Id: I85b0795928a1faeb61b03b14af0ff035f4c1d001
Reviewed-on: https://chromium-review.googlesource.com/954242Reviewed-by: default avatarDonn Denman <donnd@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541667}
parent baf48c40
...@@ -793,6 +793,7 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState ...@@ -793,6 +793,7 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
*/ */
protected void resizePanelContentViewCore(float width, float height) { protected void resizePanelContentViewCore(float width, float height) {
if (!isShowing()) return; if (!isShowing()) return;
if (isFullWidthSizePanel()) height = height - getBarHeight();
getOverlayPanelContent().onSizeChanged((int) (width / mPxToDp), (int) (height / mPxToDp)); getOverlayPanelContent().onSizeChanged((int) (width / mPxToDp), (int) (height / mPxToDp));
getOverlayPanelContent().onPhysicalBackingSizeChanged( getOverlayPanelContent().onPhysicalBackingSizeChanged(
(int) (width / mPxToDp), (int) (height / mPxToDp)); (int) (width / mPxToDp), (int) (height / mPxToDp));
......
...@@ -364,8 +364,8 @@ public class OverlayPanelContent { ...@@ -364,8 +364,8 @@ public class OverlayPanelContent {
mNativeOverlayPanelContentPtr, mInterceptNavigationDelegate, panelWebContents); mNativeOverlayPanelContentPtr, mInterceptNavigationDelegate, panelWebContents);
mContentDelegate.onContentViewCreated(); mContentDelegate.onContentViewCreated();
onPhysicalBackingSizeChanged(mContentViewWidth, mContentViewHeight);
int viewHeight = mContentViewHeight - (mSubtractBarHeight ? mBarHeightPx : 0); int viewHeight = mContentViewHeight - (mSubtractBarHeight ? mBarHeightPx : 0);
onPhysicalBackingSizeChanged(mContentViewWidth, viewHeight);
panelWebContents.setSize(mContentViewWidth, viewHeight); panelWebContents.setSize(mContentViewWidth, viewHeight);
} }
...@@ -507,7 +507,7 @@ public class OverlayPanelContent { ...@@ -507,7 +507,7 @@ public class OverlayPanelContent {
} }
void onSizeChanged(int width, int height) { void onSizeChanged(int width, int height) {
if (mContentViewCore == null || getWebContents() == null) return; if (getWebContents() == null) return;
getWebContents().setSize(width, height); getWebContents().setSize(width, height);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment