Merge pull request #1106 from illwieckz/responsive

responsive: compute font size from screen size
Unvanquished · Mar 3, 2019 · f29e78d · f29e78d
2 parents 87c2104 + 81ef853
commit f29e78d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/pkg/unvanquished_src.dpkdir b/pkg/unvanquished_src.dpkdir
diff --git a/src/cgame/cg_rocket.cpp b/src/cgame/cg_rocket.cpp
@@ -105,6 +105,10 @@ void CG_Rocket_Init( glconfig_t gl )
 	// Register elements
 	CG_Rocket_RegisterElements();
 
+	// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
+	int fontSize = std::min(cgs.glconfig.vidWidth, cgs.glconfig.vidHeight) / 90;
+	Rocket_RegisterProperty( "font-size", std::to_string(fontSize).c_str(), true, true, "number" );
+
 	Rocket_RegisterProperty( "cell-color", "white", false, false, "color" );
 	Rocket_RegisterProperty( "border-width", "0.5", false, false, "number" );
 	Rocket_RegisterProperty( "unlocked-marker-color", "green", false, false, "color" );

diff --git a/src/cgame/rocket/rocketCircleMenu.h b/src/cgame/rocket/rocketCircleMenu.h
@@ -370,9 +370,12 @@ class RocketCircleMenu : public Rocket::Core::Element, public Rocket::Controls::
 			float y = sin( angle * ( i - 1 ) * ( M_PI / 180.0f ) ) * radius;
 			float x = cos( angle * ( i - 1 ) * ( M_PI / 180.0f ) ) * radius;
 
+			// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
+			int fontSize = std::min(cgs.glconfig.vidWidth, cgs.glconfig.vidHeight) / 90;
+
 			child->SetProperty( "position", "absolute" );
-			child->SetProperty( "left", va( "%fpx", ( dimensions.x / 2 ) - ( width / 2 ) + offset.x + x ) );
-			child->SetProperty( "top", va( "%fpx", ( dimensions.y / 2 ) - ( height / 2 ) + offset.y + y ) );
+			child->SetProperty( "left", va( "%fpx", ( dimensions.x / 2 ) - ( width / 2 ) + offset.x + x * fontSize ) );
+			child->SetProperty( "top", va( "%fpx", ( dimensions.y / 2 ) - ( height / 2 ) + offset.y + y * fontSize ) );
 		}
 	}
 

diff --git a/src/cgame/rocket/rocket_documents.cpp b/src/cgame/rocket/rocket_documents.cpp
@@ -60,8 +60,16 @@ void Rocket_LoadDocument( const char *path )
 void Rocket_LoadCursor( const char *path )
 {
 	Rocket::Core::ElementDocument* document = menuContext->LoadMouseCursor( path );
+
 	if( document )
 	{
+		// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
+		int fontSize = std::min(cgs.glconfig.vidWidth, cgs.glconfig.vidHeight) / 90;
+
+		// 1.6×2.3em ≈ 20×28px on 1920×1080 screen
+		document->SetProperty( "width", va( "%fpx", 1.6 * fontSize ) );
+		document->SetProperty( "height", va( "%fpx", 2.3 * fontSize ) );
+
 		document->RemoveReference();
 	}
 }