Skip to content

New room list: remove blur effect in space #29721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

New room list: remove blur effect in space #29721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions res/css/structures/_SpacePanel.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ Please see LICENSE files in the repository root for full details.
width: 68px;
}

&.newUi {
background-color: var(--cpd-color-bg-canvas-default);
border-right: 1px solid var(--cpd-color-bg-subtle-primary);
}

.mx_SpacePanel_toggleCollapse {
position: absolute;
width: 18px;
Expand Down
8 changes: 6 additions & 2 deletions src/components/structures/LoggedInView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,8 @@ class LoggedInView extends React.Component<IProps, IState> {
return <AudioFeedArrayForLegacyCall call={call} key={call.callId} />;
});

const newRoomListEnabled = SettingsStore.getValue("feature_new_room_list");

return (
<MatrixClientContextProvider client={this._matrixClient}>
<div
Expand All @@ -714,9 +716,11 @@ class LoggedInView extends React.Component<IProps, IState> {
<div className="mx_LeftPanel_outerWrapper">
<LeftPanelLiveShareWarning isMinimized={this.props.collapseLhs || false} />
<div className="mx_LeftPanel_wrapper">
<BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
{!newRoomListEnabled && (
<BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
)}
<SpacePanel />
<BackdropPanel backgroundImage={this.state.backgroundImage} />
{!newRoomListEnabled && <BackdropPanel backgroundImage={this.state.backgroundImage} />}
<div
className="mx_LeftPanel_wrapper--user"
ref={this._resizeContainer}
Expand Down
7 changes: 6 additions & 1 deletion src/components/views/spaces/SpacePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ const SpacePanel: React.FC = () => {
}
});

const newRoomListEnabled = useSettingValue("feature_new_room_list");

return (
<RovingTabIndexProvider handleHomeEnd handleUpDown={!dragging}>
{({ onKeyDownHandler, onDragEndHandler }) => (
Expand All @@ -378,7 +380,10 @@ const SpacePanel: React.FC = () => {
}}
>
<nav
className={classNames("mx_SpacePanel", { collapsed: isPanelCollapsed })}
className={classNames("mx_SpacePanel", {
collapsed: isPanelCollapsed,
newUi: newRoomListEnabled,
})}
onKeyDown={(ev) => {
const navAction = getKeyBindingsManager().getNavigationAction(ev);
if (
Expand Down
Loading