use std::clamp to make some code clearer (#2905)

use std::clamp to make some code clearer (#2905) #1936