- {!isRMXPMode && (
-
-
-
- )}
- {!isDeleted && !isRMXPMode && currentDepth <= 3 && (
+
+
+
+ {!isDeleted && currentDepth <= 3 && (
{
@@ -295,7 +291,7 @@ export const MapTreeComponent = ({ treeScrollbarRef }: MapTreeComponentProps) =>
onCollapse={onCollapse}
onDragEnd={onDragEnd}
offsetPerLevel={26}
- isDragEnabled={!isRMXPMode}
+ isDragEnabled={true}
isNestingEnabled
/>
)}
diff --git a/src/views/components/world/map/tree/style/TreeStyle.tsx b/src/views/components/world/map/tree/style/TreeStyle.tsx
index 9c9aa44f8..c686f8554 100644
--- a/src/views/components/world/map/tree/style/TreeStyle.tsx
+++ b/src/views/components/world/map/tree/style/TreeStyle.tsx
@@ -2,7 +2,6 @@ import styled from 'styled-components';
type TreeContainerProps = {
hideMapTree: boolean;
- isTiledMode: boolean;
};
export const TreeContainer = styled.div`
@@ -13,7 +12,7 @@ export const TreeContainer = styled.div`
.tree-scrollbar {
overflow-y: scroll;
margin-right: -9px;
- height: calc(100vh - ${({ isTiledMode }) => (isTiledMode ? '253px' : '313px')});
+ height: calc(100vh - 253px);
display: ${({ hideMapTree }) => (hideMapTree ? 'none' : 'block')};
::-webkit-scrollbar {
diff --git a/src/views/pages/dashboard/Dashboard.page.tsx b/src/views/pages/dashboard/Dashboard.page.tsx
index cd2e7911e..abd4a2167 100644
--- a/src/views/pages/dashboard/Dashboard.page.tsx
+++ b/src/views/pages/dashboard/Dashboard.page.tsx
@@ -1,14 +1,13 @@
import { SecondaryButton } from '@components/buttons';
import { DataBlockWithAction, DataBlockWrapper } from '@components/database/dataBlocks';
import { PageContainerStyle, PageDataConstrainerStyle } from '@pages/database/PageContainerStyle';
-import React, { useEffect } from 'react';
+import React from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import styled from 'styled-components';
import { DashboardPageStyle } from './DashboardPageStyle';
import { useDialogsRef } from '@hooks/useDialogsRef';
import { DashboardEditorAndDeletionKeys, DashboardEditorOverlay } from '@components/dashboard/editors/DashboardEditorOverlay';
-import { useProjectStudio } from '@hooks/useProjectStudio';
import { Onboarding } from '@components/onboarding/Onboarding';
import { DashboardControlBar, DashboardFrame } from '@components/dashboard';
@@ -23,13 +22,6 @@ export const DashboardPage = () => {
const { t } = useTranslation();
const navigate = useNavigate();
const dialogsRef = useDialogsRef();
- const { projectStudioValues: projectStudio } = useProjectStudio();
-
- useEffect(() => {
- if (projectStudio.isTiledMode !== null) return;
-
- if (!dialogsRef.current?.currentDialog) dialogsRef.current?.openDialog('studio_mode_message_box', true);
- }, [dialogsRef, projectStudio]);
return (
diff --git a/src/views/pages/settings/Settings.maps.page.tsx b/src/views/pages/settings/Settings.maps.page.tsx
index 06dcbf6fd..e79e5c246 100644
--- a/src/views/pages/settings/Settings.maps.page.tsx
+++ b/src/views/pages/settings/Settings.maps.page.tsx
@@ -1,14 +1,11 @@
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { PageEditor, PageTemplate } from '@components/pages';
-import { InputWithLeftLabelContainer, Label, Toggle, InputWithTopLabelContainer, DropInput, FileInput } from '@components/inputs';
-import { useProjectStudio } from '@hooks/useProjectStudio';
+import { InputWithTopLabelContainer, Label, DropInput, FileInput } from '@components/inputs';
import styled from 'styled-components';
import { Link } from '@components/Link';
import LinkStyle from '@components/Link/LinkStyle';
import { getSetting, updateSettings } from '@utils/settings';
-import { SettingsEditorAndDeletionKeys, SettingsEditorOverlay } from '@components/settings/editors/SettingsEditorOverlay';
-import { useDialogsRef } from '@hooks/useDialogsRef';
import { basename } from '@utils/path';
import { showNotification } from '@utils/showNotification';
@@ -24,9 +21,7 @@ const DownloadMessageContainer = styled.div`
`;
export const SettingsMapsPage = () => {
- const { projectStudioValues: projectStudio } = useProjectStudio();
const [tiledPath, setTiledPath] = useState(getSetting('tiledPath'));
- const dialogsRef = useDialogsRef();
const { t } = useTranslation();
const isWin32 = window.api.platform === 'win32';
@@ -48,42 +43,27 @@ export const SettingsMapsPage = () => {
return (
-
-
- {
- event.preventDefault();
- dialogsRef.current?.openDialog('use_tiled_message_box', true);
- }}
- disabled={projectStudio.isTiledMode || false}
- />
-
- {projectStudio.isTiledMode && (
-
-
- {tiledPath ? (
-
- ) : (
-
- )}
-
- {t('download_message')}
-
-
-
- )}
-
+
+
+ {tiledPath ? (
+
+ ) : (
+
+ )}
+
+ {t('download_message')}
+
+
+
);
diff --git a/src/views/pages/world/Map.page.tsx b/src/views/pages/world/Map.page.tsx
index 21ac656de..63ca46e4d 100644
--- a/src/views/pages/world/Map.page.tsx
+++ b/src/views/pages/world/Map.page.tsx
@@ -9,7 +9,7 @@ import { useDialogsRef } from '@hooks/useDialogsRef';
import { useMapPage } from '@hooks/usePage';
import { MapEditorOverlay } from '@components/world/map/editors';
import { MapEditorAndDeletionKeys } from '@components/world/map/editors/MapEditorOverlay';
-import { MapBreadcrumb, MapEmptyState, MapFrame, MapMusics, MapRMXP2StudioUpdate } from '@components/world/map';
+import { MapBreadcrumb, MapEmptyState, MapFrame, MapMusics } from '@components/world/map';
import { DeleteButtonWithIcon, SecondaryButton } from '@components/buttons';
import { BaseIcon } from '@components/icons/BaseIcon';
import theme from '@src/AppTheme';
@@ -31,7 +31,7 @@ export const MapPageStyle = styled.div`
export const MapPage = () => {
const dialogsRef = useDialogsRef();
const dialogsMapImportRef = useDialogsRef();
- const { map, hasMap, isRMXPMode, disabledOpenTiled } = useMapPage();
+ const { map, hasMap, disabledOpenTiled } = useMapPage();
const openTiled = useOpenTiled();
const navigateMapLink = useNavigateMapLink();
const { t } = useTranslation();
@@ -50,11 +50,10 @@ export const MapPage = () => {
{ label: t('map'), path: '/world/overview', disabled: disabledOpenTiled },
]}
/>
- {isRMXPMode && }
-
-
+
+
@@ -71,16 +70,14 @@ export const MapPage = () => {
-
- dialogsRef.current?.openDialog('deletion', true)} disabled={isRMXPMode}>
- {t('delete_this_map')}
-
+
+ dialogsRef.current?.openDialog('deletion', true)}>{t('delete_this_map')}
) : (
- !isRMXPMode &&
+
)}
{}} />