danoniplus 44.5.1 → 44.5.3

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2026/02/23
+ * Revised : 2026/02/24
  *
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 44.5.1`;
-const g_revisedDate = `2026/02/23`;
+const g_version = `Ver 44.5.3`;
+const g_revisedDate = `2026/02/24`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -1537,6 +1537,34 @@ const createDivCss2Label = (_id, _text, { x = 0, y = 0, w = g_limitObj.setLblWid
 	return div;
 };
 
+/**
+ * divをドラッグ可能にする関数
+ * @param {string} _divName divのid名
+ * @param {number} [minX=0]	ドラッグ可能な範囲の左端
+ * @param {number} [minY=0]	ドラッグ可能な範囲の上端
+ * @param {number} [maxX=g_sWidth]	ドラッグ可能な範囲の右端
+ * @param {number} [maxY=g_sHeight]	ドラッグ可能な範囲の下端 
+ */
+const dragDiv = (_divName, { minX = 0, minY = 0, maxX = g_sWidth, maxY = g_sHeight } = {}) => {
+	if (document.getElementById(_divName) === null) return;
+	const div = document.getElementById(_divName);
+	div.onpointermove = evt => {
+		if (evt.buttons) {
+			const nextX = div.offsetLeft + evt.movementX;
+			const nextY = div.offsetTop + evt.movementY;
+			const clampMaxX = (maxX === minX) ? maxX : (maxX - div.offsetWidth);
+			const clampMaxY = (maxY === minY) ? maxY : (maxY - div.offsetHeight);
+			div.style.left = Math.min(Math.max(nextX, minX), clampMaxX) + 'px';
+			div.style.top = Math.min(Math.max(nextY, minY), clampMaxY) + 'px';
+			div.style.position = 'absolute';
+			div.draggable = false;
+			div.setPointerCapture(evt.pointerId);
+
+			g_posObj[_divName] = { x: div.offsetLeft, y: div.offsetTop };
+		}
+	};
+};
+
 /**
  * 画像表示
  * @param {string} _id 
@@ -6424,23 +6452,6 @@ const commonSettingBtn = _labelName => {
 		evt.target.classList.replace(g_cssObj[`button_${from}`], g_cssObj[`button_${to}`]);
 	};
 
-	const makeSettingSummary = () => {
-		const tmpDiv = createEmptySprite(divRoot, `settingSumSprite`, {
-			x: g_btnX() + 25, y: g_sHeight - 200, w: g_btnWidth() - 50, h: 100, pointerEvents: C_DIS_AUTO, overflow: C_DIS_AUTO
-		});
-		tmpDiv.style.background = g_headerObj.baseBrightFlg ? `#ffffffcc` : `#000000cc`;
-
-		multiAppend(tmpDiv,
-			createDivCss2Label(`lblSummaryHeader`, g_lblNameObj.settingSummary, g_lblPosObj.lblSummaryHeader),
-			createDivCss2Label(`lblSummaryEnvironment`, ``, g_lblPosObj.lblSummaryEnvironment),
-			createDivCss2Label(`lblSummaryDifInfo`, ``, g_lblPosObj.lblSummaryDifInfo),
-			createDivCss2Label(`lblSummaryPlaystyleInfo`, ``, g_lblPosObj.lblSummaryPlaystyleInfo),
-			createDivCss2Label(`lblSummaryDisplayInfo`, ``, g_lblPosObj.lblSummaryDisplayInfo),
-			createDivCss2Label(`lblSummaryDisplay2Info`, ``, g_lblPosObj.lblSummaryDisplay2Info),
-		);
-		tmpDiv.style.visibility = g_stateObj.settingSummaryVisible ? `visible` : `hidden`;
-	};
-
 	multiAppend(divRoot,
 
 		// タイトル画面へ戻る
@@ -6495,6 +6506,30 @@ const commonSettingBtn = _labelName => {
 	makeSettingSummary();
 };
 
+const makeSettingSummary = () => {
+	const tmpDiv = createEmptySprite(divRoot, `settingSumSprite`, g_windowObj.settingSumSprite);
+	tmpDiv.style.background = g_headerObj.baseBrightFlg ? `#ffffffcc` : `#000000cc`;
+
+	multiAppend(tmpDiv,
+		createDivCss2Label(`lblSummaryHeader`, g_lblNameObj.settingSummary, g_lblPosObj.lblSummaryHeader),
+		createDivCss2Label(`lblSummaryEnvironment`, ``, g_lblPosObj.lblSummaryEnvironment),
+		createDivCss2Label(`lblSummaryDifHeader`, g_lblNameObj.rt_Difficulty, g_lblPosObj.lblSummaryDifHeader),
+		createDivCss2Label(`lblSummaryDifInfo`, ``, g_lblPosObj.lblSummaryDifInfo),
+		createDivCss2Label(`lblSummaryPlaystyleHeader`, g_lblNameObj.rt_Style, g_lblPosObj.lblSummaryPlaystyleHeader),
+		createDivCss2Label(`lblSummaryPlaystyleInfo`, ``, g_lblPosObj.lblSummaryPlaystyleInfo),
+		createDivCss2Label(`lblSummaryDisplayHeader`, g_lblNameObj.rt_Display, g_lblPosObj.lblSummaryDisplayHeader),
+		createDivCss2Label(`lblSummaryDisplayInfo`, ``, g_lblPosObj.lblSummaryDisplayInfo),
+		createDivCss2Label(`lblSummaryDisplay2Info`, ``, g_lblPosObj.lblSummaryDisplay2Info),
+	);
+	tmpDiv.style.visibility = g_stateObj.settingSummaryVisible ? `visible` : `hidden`;
+	dragDiv(`settingSumSprite`, {
+		minX: g_btnX() + 25, maxX: g_btnX() + 25, minY: 10, maxY: g_sHeight - 10,
+	});
+	if (g_posObj.settingSumSprite?.y !== undefined) {
+		document.getElementById(`settingSumSprite`).style.top = wUnit(g_posObj.settingSumSprite.y);
+	}
+};
+
 const visibleSettingSummary = _visible => {
 	const summaryDiv = document.getElementById(`settingSumSprite`);
 	if (summaryDiv) {
@@ -6514,7 +6549,9 @@ const updateSettingSummary = () => {
 	document.getElementById(`lblSummaryPlaystyleInfo`).innerHTML = settingData.playStyleData;
 	document.getElementById(`lblSummaryDisplayInfo`).innerHTML = settingData.displayData;
 	document.getElementById(`lblSummaryDisplay2Info`).innerHTML = settingData.display2Data;
-	document.getElementById(`lblSummaryEnvironment`).innerHTML = `(Adj: ${g_stateObj.adjustment} f, Volume: ${g_stateObj.volume}%, ColorType: ${g_colorType})`;
+	document.getElementById(`lblSummaryEnvironment`).innerHTML =
+		`(Adj: ${g_stateObj.adjustment} f, Volume: ${g_stateObj.volume}%, ` +
+		`ColorType: ${g_colorType}, KeyPattern: ${g_keyObj.currentPtn === -1 ? 'Self' : g_keyObj.currentPtn + 1})`;
 };
 
 /**
@@ -7945,13 +7982,16 @@ const createLblSetting = (_settingName, _adjY = 0, _settingLabel = _settingName)
 };
 
 /**
- * 設定名の置き換え処理
+ * 設定名の置き換え処理（未指定時は原則g_lblNameObjの値を使用、明示的な指定がある場合のみ元の名前を返却）
  * @param {string} _name 
  * @returns {string}
  */
 const getStgDetailName = _name => {
-	return g_lblNameObj[`u_${_name}`] !== undefined &&
-		(g_presetObj.lblRenames === undefined || g_presetObj.lblRenames[g_currentPage]) ? g_lblNameObj[`u_${_name}`] : _name;
+	return g_lblNameObj[`u_${_name}`] !== undefined && (
+		g_presetObj.lblRenames === undefined ||
+		g_presetObj.lblRenames[g_currentPage] === undefined ||
+		g_presetObj.lblRenames[g_currentPage]
+	) ? g_lblNameObj[`u_${_name}`] : _name;
 };
 
 /**
@@ -15079,7 +15119,7 @@ const getSelectedSettingList = (_shuffleName) => {
 		withDisplays(g_stateObj.d_filterline, C_FLG_ON, g_lblNameObj.rd_FilterLine),
 	].filter(value => value !== ``).join(`, `);
 	if (displayData === ``) {
-		displayData = `All Visible`;
+		displayData = getStgDetailName(`All Visible`);
 	} else {
 		// 表示設定のOFF項目を末尾にまとめる
 		const displayList = displayData.split(`, `).sort((a, b) => b.includes(`:`) - a.includes(`:`));

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2026/02/23 (v44.5.0)
+ * Revised : 2026/02/23 (v44.5.2)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -201,6 +201,7 @@ const updateWindowSiz = () => {
     Object.assign(g_windowObj, {
         keyTitleSprite: { x: g_btnX(1 / 4), y: g_sHeight / 2 - 5, w: g_btnWidth(1 / 2), h: 16 },
         mSelectTitleSprite: { x: g_btnX(), y: 0, w: g_btnWidth(), h: g_sHeight, clipPath: `inset(12% 0 8% 0)` },
+        settingSumSprite: { x: g_btnX() + 25, y: g_sHeight - 200, w: g_btnWidth() - 50, h: 100, pointerEvents: C_DIS_AUTO, overflow: C_DIS_AUTO },
         optionSprite: { x: (g_sWidth - 450) / 2, y: 65, w: 450, h: 325 },
         dataSprite: { x: g_btnX() + (g_sWidth - Math.max(g_sWidth - 100, 450)) / 2, y: 65, w: Math.max(g_sWidth - 100, 450), h: 325 },
         keyListSprite: { x: 0, y: g_limitObj.setLblHeight * 7.5 + 40, w: 150, h: g_sHeight - 380, overflow: C_DIS_AUTO },
@@ -384,17 +385,26 @@ const updateWindowSiz = () => {
         lblSummaryEnvironment: {
             x: 150, y: 5, w: g_btnWidth() - 200, h: 20, siz: 12, align: C_ALIGN_LEFT,
         },
+        lblSummaryDifHeader: {
+            x: 0, y: 20, w: 70, h: 20, siz: 12, align: C_ALIGN_LEFT, opacity: 0.75,
+        },
         lblSummaryDifInfo: {
-            x: 0, y: 20, w: g_btnWidth() - 50, h: 20, siz: 12, align: C_ALIGN_LEFT,
+            x: 70, y: 20, w: g_btnWidth() - 120, h: 20, siz: 12, align: C_ALIGN_LEFT,
+        },
+        lblSummaryPlaystyleHeader: {
+            x: 0, y: 35, w: 70, h: 20, siz: 12, align: C_ALIGN_LEFT, opacity: 0.75,
         },
         lblSummaryPlaystyleInfo: {
-            x: 0, y: 35, w: g_btnWidth() - 50, h: 20, siz: 12, align: C_ALIGN_LEFT,
+            x: 70, y: 35, w: g_btnWidth() - 120, h: 20, siz: 12, align: C_ALIGN_LEFT,
+        },
+        lblSummaryDisplayHeader: {
+            x: 0, y: 50, w: 70, h: 20, siz: 12, align: C_ALIGN_LEFT, opacity: 0.75,
         },
         lblSummaryDisplayInfo: {
-            x: 0, y: 50, w: g_btnWidth() - 50, h: 20, siz: 12, align: C_ALIGN_LEFT,
+            x: 70, y: 50, w: g_btnWidth() - 120, h: 20, siz: 12, align: C_ALIGN_LEFT,
         },
         lblSummaryDisplay2Info: {
-            x: 0, y: 65, w: g_btnWidth() - 50, h: 20, siz: 12, align: C_ALIGN_LEFT,
+            x: 70, y: 65, w: g_btnWidth() - 120, h: 20, siz: 12, align: C_ALIGN_LEFT,
         },
 
         lblMusicInfo: {
@@ -4220,6 +4230,8 @@ const g_lblNameObj = {
     'u_Type3': `Type3`,
     'u_Type4': `Type4`,
 
+    'u_All Visible': `All Visible`,
+
     ColorType: `ColorType`,
     ImgType: `ImgType`,
     ColorGroup: `ColorGr.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "44.5.1",
+  "version": "44.5.3",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "./js/danoni_main.js",
   "scripts": {